/i.test(cap[0])) {
+ } else if (this.lexer.state.inLink && this.rules.other.endATag.test(cap[0])) {
this.lexer.state.inLink = false;
}
- if (!this.lexer.state.inRawBlock && /^<(pre|code|kbd|script)(\s|>)/i.test(cap[0])) {
+ if (!this.lexer.state.inRawBlock && this.rules.other.startPreScriptTag.test(cap[0])) {
this.lexer.state.inRawBlock = true;
- } else if (this.lexer.state.inRawBlock && /^<\/(pre|code|kbd|script)(\s|>)/i.test(cap[0])) {
+ } else if (this.lexer.state.inRawBlock && this.rules.other.endPreScriptTag.test(cap[0])) {
this.lexer.state.inRawBlock = false;
}
return {
- type: this.options.sanitize ? "text" : "html",
+ type: "html",
raw: cap[0],
inLink: this.lexer.state.inLink,
inRawBlock: this.lexer.state.inRawBlock,
- text: this.options.sanitize ? this.options.sanitizer ? this.options.sanitizer(cap[0]) : escape4(cap[0]) : cap[0]
+ block: false,
+ text: cap[0]
};
}
}
@@ -35248,8 +37919,8 @@
const cap = this.rules.inline.link.exec(src);
if (cap) {
const trimmedUrl = cap[2].trim();
- if (!this.options.pedantic && /^$/.test(trimmedUrl)) {
+ if (!this.options.pedantic && this.rules.other.startAngleBracket.test(trimmedUrl)) {
+ if (!this.rules.other.endAngleBracket.test(trimmedUrl)) {
return;
}
const rtrimSlash = rtrim(trimmedUrl.slice(0, -1), "\\");
@@ -35269,62 +37940,62 @@
let href = cap[2];
let title = "";
if (this.options.pedantic) {
- const link2 = /^([^'"]*[^\s])\s+(['"])(.*)\2/.exec(href);
- if (link2) {
- href = link2[1];
- title = link2[3];
+ const link3 = this.rules.other.pedanticHrefTitle.exec(href);
+ if (link3) {
+ href = link3[1];
+ title = link3[3];
}
} else {
title = cap[3] ? cap[3].slice(1, -1) : "";
}
href = href.trim();
- if (/^$/.test(trimmedUrl)) {
+ if (this.rules.other.startAngleBracket.test(href)) {
+ if (this.options.pedantic && !this.rules.other.endAngleBracket.test(trimmedUrl)) {
href = href.slice(1);
} else {
href = href.slice(1, -1);
}
}
return outputLink(cap, {
- href: href ? href.replace(this.rules.inline._escapes, "$1") : href,
- title: title ? title.replace(this.rules.inline._escapes, "$1") : title
- }, cap[0], this.lexer);
+ href: href ? href.replace(this.rules.inline.anyPunctuation, "$1") : href,
+ title: title ? title.replace(this.rules.inline.anyPunctuation, "$1") : title
+ }, cap[0], this.lexer, this.rules);
}
}
reflink(src, links) {
let cap;
if ((cap = this.rules.inline.reflink.exec(src)) || (cap = this.rules.inline.nolink.exec(src))) {
- let link2 = (cap[2] || cap[1]).replace(/\s+/g, " ");
- link2 = links[link2.toLowerCase()];
- if (!link2 || !link2.href) {
- const text2 = cap[0].charAt(0);
+ const linkString = (cap[2] || cap[1]).replace(this.rules.other.multipleSpaceGlobal, " ");
+ const link3 = links[linkString.toLowerCase()];
+ if (!link3) {
+ const text = cap[0].charAt(0);
return {
type: "text",
- raw: text2,
- text: text2
+ raw: text,
+ text
};
}
- return outputLink(cap, link2, cap[0], this.lexer);
+ return outputLink(cap, link3, cap[0], this.lexer, this.rules);
}
}
emStrong(src, maskedSrc, prevChar = "") {
- let match = this.rules.inline.emStrong.lDelim.exec(src);
+ let match = this.rules.inline.emStrongLDelim.exec(src);
if (!match)
return;
- if (match[3] && prevChar.match(/[\p{L}\p{N}]/u))
+ if (match[3] && prevChar.match(this.rules.other.unicodeAlphaNumeric))
return;
const nextChar = match[1] || match[2] || "";
- if (!nextChar || nextChar && (prevChar === "" || this.rules.inline.punctuation.exec(prevChar))) {
- const lLength = match[0].length - 1;
+ 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.emStrong.rDelimAst : this.rules.inline.emStrong.rDelimUnd;
+ 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;
+ rLength = [...rDelim].length;
if (match[3] || match[4]) {
delimTotal += rLength;
continue;
@@ -35338,21 +38009,23 @@
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 text3 = src.slice(1, lLength + match.index + rLength);
+ const text2 = raw.slice(1, -1);
return {
type: "em",
- raw: src.slice(0, lLength + match.index + rLength + 1),
- text: text3,
- tokens: this.lexer.inlineTokens(text3, [])
+ raw,
+ text: text2,
+ tokens: this.lexer.inlineTokens(text2)
};
}
- const text2 = src.slice(2, lLength + match.index + rLength - 1);
+ const text = raw.slice(2, -2);
return {
type: "strong",
- raw: src.slice(0, lLength + match.index + rLength + 1),
- text: text2,
- tokens: this.lexer.inlineTokens(text2, [])
+ raw,
+ text,
+ tokens: this.lexer.inlineTokens(text)
};
}
}
@@ -35360,17 +38033,16 @@
codespan(src) {
const cap = this.rules.inline.code.exec(src);
if (cap) {
- let text2 = cap[2].replace(/\n/g, " ");
- const hasNonSpaceChars = /[^ ]/.test(text2);
- const hasSpaceCharsOnBothEnds = /^ /.test(text2) && / $/.test(text2);
+ let text = cap[2].replace(this.rules.other.newLineCharGlobal, " ");
+ const hasNonSpaceChars = this.rules.other.nonSpaceChar.test(text);
+ const hasSpaceCharsOnBothEnds = this.rules.other.startingSpaceChar.test(text) && this.rules.other.endingSpaceChar.test(text);
if (hasNonSpaceChars && hasSpaceCharsOnBothEnds) {
- text2 = text2.substring(1, text2.length - 1);
+ text = text.substring(1, text.length - 1);
}
- text2 = escape4(text2, true);
return {
type: "codespan",
raw: cap[0],
- text: text2
+ text
};
}
}
@@ -35390,219 +38062,96 @@
type: "del",
raw: cap[0],
text: cap[2],
- tokens: this.lexer.inlineTokens(cap[2], [])
+ tokens: this.lexer.inlineTokens(cap[2])
};
}
}
- autolink(src, mangle2) {
+ autolink(src) {
const cap = this.rules.inline.autolink.exec(src);
if (cap) {
- let text2, href;
+ let text, href;
if (cap[2] === "@") {
- text2 = escape4(this.options.mangle ? mangle2(cap[1]) : cap[1]);
- href = "mailto:" + text2;
+ text = cap[1];
+ href = "mailto:" + text;
} else {
- text2 = escape4(cap[1]);
- href = text2;
+ text = cap[1];
+ href = text;
}
return {
type: "link",
raw: cap[0],
- text: text2,
+ text,
href,
tokens: [
{
type: "text",
- raw: text2,
- text: text2
+ raw: text,
+ text
}
]
};
}
}
- url(src, mangle2) {
+ url(src) {
+ var _a4, _b3;
let cap;
if (cap = this.rules.inline.url.exec(src)) {
- let text2, href;
+ let text, href;
if (cap[2] === "@") {
- text2 = escape4(this.options.mangle ? mangle2(cap[0]) : cap[0]);
- href = "mailto:" + text2;
+ text = cap[0];
+ href = "mailto:" + text;
} else {
let prevCapZero;
do {
prevCapZero = cap[0];
- cap[0] = this.rules.inline._backpedal.exec(cap[0])[0];
+ cap[0] = (_b3 = (_a4 = this.rules.inline._backpedal.exec(cap[0])) == null ? void 0 : _a4[0]) != null ? _b3 : "";
} while (prevCapZero !== cap[0]);
- text2 = escape4(cap[0]);
+ text = cap[0];
if (cap[1] === "www.") {
- href = "http://" + text2;
+ href = "http://" + cap[0];
} else {
- href = text2;
+ href = cap[0];
}
}
return {
type: "link",
raw: cap[0],
- text: text2,
+ text,
href,
tokens: [
{
type: "text",
- raw: text2,
- text: text2
+ raw: text,
+ text
}
]
};
}
}
- inlineText(src, smartypants2) {
+ inlineText(src) {
const cap = this.rules.inline.text.exec(src);
if (cap) {
- let text2;
- if (this.lexer.state.inRawBlock) {
- text2 = this.options.sanitize ? this.options.sanitizer ? this.options.sanitizer(cap[0]) : escape4(cap[0]) : cap[0];
- } else {
- text2 = escape4(this.options.smartypants ? smartypants2(cap[0]) : cap[0]);
- }
+ const escaped = this.lexer.state.inRawBlock;
return {
type: "text",
raw: cap[0],
- text: text2
+ text: cap[0],
+ escaped
};
}
}
};
- var block = {
- newline: /^(?: *(?:\n|$))+/,
- code: /^( {4}[^\n]+(?:\n(?: *(?:\n|$))*)?)+/,
- fences: /^ {0,3}(`{3,}(?=[^`\n]*\n)|~{3,})([^\n]*)\n(?:|([\s\S]*?)\n)(?: {0,3}\1[~`]* *(?=\n|$)|$)/,
- hr: /^ {0,3}((?:-[\t ]*){3,}|(?:_[ \t]*){3,}|(?:\*[ \t]*){3,})(?:\n+|$)/,
- heading: /^ {0,3}(#{1,6})(?=\s|$)(.*)(?:\n+|$)/,
- blockquote: /^( {0,3}> ?(paragraph|[^\n]*)(?:\n|$))+/,
- list: /^( {0,3}bull)([ \t][^\n]+?)?(?:\n|$)/,
- html: "^ {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|$))",
- def: /^ {0,3}\[(label)\]: *(?:\n *)?]+)>?(?:(?: +(?:\n *)?| *\n *)(title))? *(?:\n+|$)/,
- table: noopTest,
- lheading: /^([^\n]+)\n {0,3}(=+|-+) *(?:\n+|$)/,
- _paragraph: /^([^\n]+(?:\n(?!hr|heading|lheading|blockquote|fences|list|html|table| +\n)[^\n]+)*)/,
- text: /^[^\n]+/
- };
- block._label = /(?!\s*\])(?:\\.|[^\[\]\\])+/;
- block._title = /(?:"(?:\\"?|[^"\\])*"|'[^'\n]*(?:\n[^'\n]+)*\n?'|\([^()]*\))/;
- block.def = edit(block.def).replace("label", block._label).replace("title", block._title).getRegex();
- block.bullet = /(?:[*+-]|\d{1,9}[.)])/;
- block.listItemStart = edit(/^( *)(bull) */).replace("bull", block.bullet).getRegex();
- block.list = edit(block.list).replace(/bull/g, block.bullet).replace("hr", "\\n+(?=\\1?(?:(?:- *){3,}|(?:_ *){3,}|(?:\\* *){3,})(?:\\n+|$))").replace("def", "\\n+(?=" + block.def.source + ")").getRegex();
- block._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|section|source|summary|table|tbody|td|tfoot|th|thead|title|tr|track|ul";
- block._comment = /|$)/;
- block.html = edit(block.html, "i").replace("comment", block._comment).replace("tag", block._tag).replace("attribute", / +[a-zA-Z:_][\w.:-]*(?: *= *"[^"\n]*"| *= *'[^'\n]*'| *= *[^\s"'=<>`]+)?/).getRegex();
- block.paragraph = edit(block._paragraph).replace("hr", block.hr).replace("heading", " {0,3}#{1,6} ").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", block._tag).getRegex();
- block.blockquote = edit(block.blockquote).replace("paragraph", block.paragraph).getRegex();
- block.normal = merge2({}, block);
- block.gfm = merge2({}, block.normal, {
- table: "^ *([^\\n ].*\\|.*)\\n {0,3}(?:\\| *)?(:?-+:? *(?:\\| *:?-+:? *)*)(?:\\| *)?(?:\\n((?:(?! *\\n|hr|heading|blockquote|code|fences|list|html).*(?:\\n|$))*)\\n*|$)"
- });
- block.gfm.table = edit(block.gfm.table).replace("hr", block.hr).replace("heading", " {0,3}#{1,6} ").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", block._tag).getRegex();
- block.gfm.paragraph = edit(block._paragraph).replace("hr", block.hr).replace("heading", " {0,3}#{1,6} ").replace("|lheading", "").replace("table", block.gfm.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", block._tag).getRegex();
- block.pedantic = merge2({}, block.normal, {
- html: edit(`^ *(?:comment *(?:\\n|\\s*$)|<(tag)[\\s\\S]+? *(?:\\n{2,}|\\s*$)|\\s]*)*?/?> *(?:\\n{2,}|\\s*$))`).replace("comment", block._comment).replace(/tag/g, "(?!(?:a|em|strong|small|s|cite|q|dfn|abbr|data|time|code|var|samp|kbd|sub|sup|i|b|u|mark|ruby|rt|rp|bdi|bdo|span|br|wbr|ins|del|img)\\b)\\w+(?!:|[^\\w\\s@]*@)\\b").getRegex(),
- def: /^ *\[([^\]]+)\]: *]+)>?(?: +(["(][^\n]+[")]))? *(?:\n+|$)/,
- heading: /^(#{1,6})(.*)(?:\n+|$)/,
- fences: noopTest,
- paragraph: edit(block.normal._paragraph).replace("hr", block.hr).replace("heading", " *#{1,6} *[^\n]").replace("lheading", block.lheading).replace("blockquote", " {0,3}>").replace("|fences", "").replace("|list", "").replace("|html", "").getRegex()
- });
- var inline = {
- escape: /^\\([!"#$%&'()*+,\-./:;<=>?@\[\]\\^_`{|}~])/,
- autolink: /^<(scheme:[^\s\x00-\x1f<>]*|email)>/,
- url: noopTest,
- tag: "^comment|^|^<[a-zA-Z][\\w-]*(?:attribute)*?\\s*/?>|^<\\?[\\s\\S]*?\\?>|^|^",
- link: /^!?\[(label)\]\(\s*(href)(?:\s+(title))?\s*\)/,
- reflink: /^!?\[(label)\]\[(ref)\]/,
- nolink: /^!?\[(ref)\](?:\[\])?/,
- reflinkSearch: "reflink|nolink(?!\\()",
- emStrong: {
- lDelim: /^(?:\*+(?:([punct_])|[^\s*]))|^_+(?:([punct*])|([^\s_]))/,
- rDelimAst: /^[^_*]*?\_\_[^_*]*?\*[^_*]*?(?=\_\_)|[^*]+(?=[^*])|[punct_](\*+)(?=[\s]|$)|[^punct*_\s](\*+)(?=[punct_\s]|$)|[punct_\s](\*+)(?=[^punct*_\s])|[\s](\*+)(?=[punct_])|[punct_](\*+)(?=[punct_])|[^punct*_\s](\*+)(?=[^punct*_\s])/,
- rDelimUnd: /^[^_*]*?\*\*[^_*]*?\_[^_*]*?(?=\*\*)|[^_]+(?=[^_])|[punct*](\_+)(?=[\s]|$)|[^punct*_\s](\_+)(?=[punct*\s]|$)|[punct*\s](\_+)(?=[^punct*_\s])|[\s](\_+)(?=[punct*])|[punct*](\_+)(?=[punct*])/
- },
- code: /^(`+)([^`]|[^`][\s\S]*?[^`])\1(?!`)/,
- br: /^( {2,}|\\)\n(?!\s*$)/,
- del: noopTest,
- text: /^(`+|[^`])(?:(?= {2,}\n)|[\s\S]*?(?:(?=[\\?@\\[\\]`^{|}~";
- inline.punctuation = edit(inline.punctuation).replace(/punctuation/g, inline._punctuation).getRegex();
- inline.blockSkip = /\[[^\]]*?\]\([^\)]*?\)|`[^`]*?`|<[^>]*?>/g;
- inline.escapedEmSt = /\\\*|\\_/g;
- inline._comment = edit(block._comment).replace("(?:-->|$)", "-->").getRegex();
- inline.emStrong.lDelim = edit(inline.emStrong.lDelim).replace(/punct/g, inline._punctuation).getRegex();
- inline.emStrong.rDelimAst = edit(inline.emStrong.rDelimAst, "g").replace(/punct/g, inline._punctuation).getRegex();
- inline.emStrong.rDelimUnd = edit(inline.emStrong.rDelimUnd, "g").replace(/punct/g, inline._punctuation).getRegex();
- inline._escapes = /\\([!"#$%&'()*+,\-./:;<=>?@\[\]\\^_`{|}~])/g;
- inline._scheme = /[a-zA-Z][a-zA-Z0-9+.-]{1,31}/;
- inline._email = /[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+(@)[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)+(?![-_])/;
- inline.autolink = edit(inline.autolink).replace("scheme", inline._scheme).replace("email", inline._email).getRegex();
- inline._attribute = /\s+[a-zA-Z:_][\w.:-]*(?:\s*=\s*"[^"]*"|\s*=\s*'[^']*'|\s*=\s*[^\s"'=<>`]+)?/;
- inline.tag = edit(inline.tag).replace("comment", inline._comment).replace("attribute", inline._attribute).getRegex();
- inline._label = /(?:\[(?:\\.|[^\[\]\\])*\]|\\.|`[^`]*`|[^\[\]\\`])*?/;
- inline._href = /<(?:\\.|[^\n<>\\])+>|[^\s\x00-\x1f]*/;
- inline._title = /"(?:\\"?|[^"\\])*"|'(?:\\'?|[^'\\])*'|\((?:\\\)?|[^)\\])*\)/;
- inline.link = edit(inline.link).replace("label", inline._label).replace("href", inline._href).replace("title", inline._title).getRegex();
- inline.reflink = edit(inline.reflink).replace("label", inline._label).replace("ref", block._label).getRegex();
- inline.nolink = edit(inline.nolink).replace("ref", block._label).getRegex();
- inline.reflinkSearch = edit(inline.reflinkSearch, "g").replace("reflink", inline.reflink).replace("nolink", inline.nolink).getRegex();
- inline.normal = merge2({}, inline);
- inline.pedantic = merge2({}, inline.normal, {
- strong: {
- start: /^__|\*\*/,
- middle: /^__(?=\S)([\s\S]*?\S)__(?!_)|^\*\*(?=\S)([\s\S]*?\S)\*\*(?!\*)/,
- endAst: /\*\*(?!\*)/g,
- endUnd: /__(?!_)/g
- },
- em: {
- start: /^_|\*/,
- middle: /^()\*(?=\S)([\s\S]*?\S)\*(?!\*)|^_(?=\S)([\s\S]*?\S)_(?!_)/,
- endAst: /\*(?!\*)/g,
- endUnd: /_(?!_)/g
- },
- link: edit(/^!?\[(label)\]\((.*?)\)/).replace("label", inline._label).getRegex(),
- reflink: edit(/^!?\[(label)\]\s*\[([^\]]*)\]/).replace("label", inline._label).getRegex()
- });
- inline.gfm = merge2({}, inline.normal, {
- escape: edit(inline.escape).replace("])", "~|])").getRegex(),
- _extended_email: /[A-Za-z0-9._+-]+(@)[a-zA-Z0-9-_]+(?:\.[a-zA-Z0-9-_]*[a-zA-Z0-9])+(?![-_])/,
- url: /^((?:ftp|https?):\/\/|www\.)(?:[a-zA-Z0-9\-]+\.?)+[^\s<]*|^email/,
- _backpedal: /(?:[^?!.,:;*_~()&]+|\([^)]*\)|&(?![a-zA-Z0-9]+;$)|[?!.,:;*_~)]+(?!$))+/,
- del: /^(~~?)(?=[^\s~])([\s\S]*?[^\s~])\1(?=[^~]|$)/,
- text: /^([`~]+|[^`~])(?:(?= {2,}\n)|(?=[a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-]+@)|[\s\S]*?(?:(?=[\\ 0.5) {
- ch = "x" + ch.toString(16);
- }
- out += "&#" + ch + ";";
- }
- return out;
- }
- var Lexer = class {
+ var _Lexer = class __Lexer {
constructor(options2) {
+ __publicField(this, "tokens");
+ __publicField(this, "options");
+ __publicField(this, "state");
+ __publicField(this, "tokenizer");
+ __publicField(this, "inlineQueue");
this.tokens = [];
this.tokens.links = /* @__PURE__ */ Object.create(null);
- this.options = options2 || defaults;
- this.options.tokenizer = this.options.tokenizer || new Tokenizer();
+ this.options = options2 || _defaults;
+ this.options.tokenizer = this.options.tokenizer || new _Tokenizer();
this.tokenizer = this.options.tokenizer;
this.tokenizer.options = this.options;
this.tokenizer.lexer = this;
@@ -35613,6 +38162,7 @@
top: true
};
const rules = {
+ other,
block: block.normal,
inline: inline.normal
};
@@ -35629,40 +38179,50 @@
}
this.tokenizer.rules = rules;
}
+ /**
+ * Expose Rules
+ */
static get rules() {
return {
block,
inline
};
}
+ /**
+ * Static Lex Method
+ */
static lex(src, options2) {
- const lexer2 = new Lexer(options2);
+ const lexer2 = new __Lexer(options2);
return lexer2.lex(src);
}
+ /**
+ * Static Lex Inline Method
+ */
static lexInline(src, options2) {
- const lexer2 = new Lexer(options2);
+ const lexer2 = new __Lexer(options2);
return lexer2.inlineTokens(src);
}
+ /**
+ * Preprocessing
+ */
lex(src) {
- src = src.replace(/\r\n|\r/g, "\n");
+ src = src.replace(other.carriageReturn, "\n");
this.blockTokens(src, this.tokens);
- let next;
- while (next = this.inlineQueue.shift()) {
+ for (let i3 = 0; i3 < this.inlineQueue.length; i3++) {
+ const next = this.inlineQueue[i3];
this.inlineTokens(next.src, next.tokens);
}
+ this.inlineQueue = [];
return this.tokens;
}
- blockTokens(src, tokens = []) {
+ blockTokens(src, tokens = [], lastParagraphClipped = false) {
+ var _a4, _b3, _c2;
if (this.options.pedantic) {
- src = src.replace(/\t/g, " ").replace(/^ +$/gm, "");
- } else {
- src = src.replace(/^( *)(\t+)/gm, (_, leading, tabs) => {
- return leading + " ".repeat(tabs.length);
- });
+ src = src.replace(other.tabCharGlobal, " ").replace(other.spaceLine, "");
}
- let token, lastToken, cutSrc, lastParagraphClipped;
while (src) {
- if (this.options.extensions && this.options.extensions.block && this.options.extensions.block.some((extTokenizer) => {
+ let token;
+ if ((_b3 = (_a4 = this.options.extensions) == null ? void 0 : _a4.block) == null ? void 0 : _b3.some((extTokenizer) => {
if (token = extTokenizer.call({ lexer: this }, src, tokens)) {
src = src.substring(token.raw.length);
tokens.push(token);
@@ -35674,8 +38234,9 @@
}
if (token = this.tokenizer.space(src)) {
src = src.substring(token.raw.length);
- if (token.raw.length === 1 && tokens.length > 0) {
- tokens[tokens.length - 1].raw += "\n";
+ const lastToken = tokens.at(-1);
+ if (token.raw.length === 1 && lastToken !== void 0) {
+ lastToken.raw += "\n";
} else {
tokens.push(token);
}
@@ -35683,11 +38244,11 @@
}
if (token = this.tokenizer.code(src)) {
src = src.substring(token.raw.length);
- lastToken = tokens[tokens.length - 1];
- if (lastToken && (lastToken.type === "paragraph" || lastToken.type === "text")) {
+ const lastToken = tokens.at(-1);
+ if ((lastToken == null ? void 0 : lastToken.type) === "paragraph" || (lastToken == null ? void 0 : lastToken.type) === "text") {
lastToken.raw += "\n" + token.raw;
lastToken.text += "\n" + token.text;
- this.inlineQueue[this.inlineQueue.length - 1].src = lastToken.text;
+ this.inlineQueue.at(-1).src = lastToken.text;
} else {
tokens.push(token);
}
@@ -35725,11 +38286,11 @@
}
if (token = this.tokenizer.def(src)) {
src = src.substring(token.raw.length);
- lastToken = tokens[tokens.length - 1];
- if (lastToken && (lastToken.type === "paragraph" || lastToken.type === "text")) {
+ const lastToken = tokens.at(-1);
+ if ((lastToken == null ? void 0 : lastToken.type) === "paragraph" || (lastToken == null ? void 0 : lastToken.type) === "text") {
lastToken.raw += "\n" + token.raw;
lastToken.text += "\n" + token.raw;
- this.inlineQueue[this.inlineQueue.length - 1].src = lastToken.text;
+ this.inlineQueue.at(-1).src = lastToken.text;
} else if (!this.tokens.links[token.tag]) {
this.tokens.links[token.tag] = {
href: token.href,
@@ -35748,12 +38309,12 @@
tokens.push(token);
continue;
}
- cutSrc = src;
- if (this.options.extensions && this.options.extensions.startBlock) {
+ let cutSrc = src;
+ if ((_c2 = this.options.extensions) == null ? void 0 : _c2.startBlock) {
let startIndex = Infinity;
const tempSrc = src.slice(1);
let tempStart;
- this.options.extensions.startBlock.forEach(function(getStartIndex) {
+ this.options.extensions.startBlock.forEach((getStartIndex) => {
tempStart = getStartIndex.call({ lexer: this }, tempSrc);
if (typeof tempStart === "number" && tempStart >= 0) {
startIndex = Math.min(startIndex, tempStart);
@@ -35764,12 +38325,12 @@
}
}
if (this.state.top && (token = this.tokenizer.paragraph(cutSrc))) {
- lastToken = tokens[tokens.length - 1];
- if (lastParagraphClipped && lastToken.type === "paragraph") {
+ const lastToken = tokens.at(-1);
+ if (lastParagraphClipped && (lastToken == null ? void 0 : lastToken.type) === "paragraph") {
lastToken.raw += "\n" + token.raw;
lastToken.text += "\n" + token.text;
this.inlineQueue.pop();
- this.inlineQueue[this.inlineQueue.length - 1].src = lastToken.text;
+ this.inlineQueue.at(-1).src = lastToken.text;
} else {
tokens.push(token);
}
@@ -35779,12 +38340,12 @@
}
if (token = this.tokenizer.text(src)) {
src = src.substring(token.raw.length);
- lastToken = tokens[tokens.length - 1];
- if (lastToken && lastToken.type === "text") {
+ const lastToken = tokens.at(-1);
+ if ((lastToken == null ? void 0 : lastToken.type) === "text") {
lastToken.raw += "\n" + token.raw;
lastToken.text += "\n" + token.text;
this.inlineQueue.pop();
- this.inlineQueue[this.inlineQueue.length - 1].src = lastToken.text;
+ this.inlineQueue.at(-1).src = lastToken.text;
} else {
tokens.push(token);
}
@@ -35803,36 +38364,42 @@
this.state.top = true;
return tokens;
}
- inline(src, tokens) {
+ inline(src, tokens = []) {
this.inlineQueue.push({ src, tokens });
+ return tokens;
}
+ /**
+ * Lexing/Compiling
+ */
inlineTokens(src, tokens = []) {
- let token, lastToken, cutSrc;
+ var _a4, _b3, _c2;
let maskedSrc = src;
- let match;
- let keepPrevChar, prevChar;
+ let match = null;
if (this.tokens.links) {
const links = Object.keys(this.tokens.links);
if (links.length > 0) {
while ((match = this.tokenizer.rules.inline.reflinkSearch.exec(maskedSrc)) != null) {
if (links.includes(match[0].slice(match[0].lastIndexOf("[") + 1, -1))) {
- maskedSrc = maskedSrc.slice(0, match.index) + "[" + repeatString("a", match[0].length - 2) + "]" + maskedSrc.slice(this.tokenizer.rules.inline.reflinkSearch.lastIndex);
+ maskedSrc = maskedSrc.slice(0, match.index) + "[" + "a".repeat(match[0].length - 2) + "]" + maskedSrc.slice(this.tokenizer.rules.inline.reflinkSearch.lastIndex);
}
}
}
}
while ((match = this.tokenizer.rules.inline.blockSkip.exec(maskedSrc)) != null) {
- maskedSrc = maskedSrc.slice(0, match.index) + "[" + repeatString("a", match[0].length - 2) + "]" + maskedSrc.slice(this.tokenizer.rules.inline.blockSkip.lastIndex);
+ maskedSrc = maskedSrc.slice(0, match.index) + "[" + "a".repeat(match[0].length - 2) + "]" + maskedSrc.slice(this.tokenizer.rules.inline.blockSkip.lastIndex);
}
- while ((match = this.tokenizer.rules.inline.escapedEmSt.exec(maskedSrc)) != null) {
- maskedSrc = maskedSrc.slice(0, match.index) + "++" + maskedSrc.slice(this.tokenizer.rules.inline.escapedEmSt.lastIndex);
+ while ((match = this.tokenizer.rules.inline.anyPunctuation.exec(maskedSrc)) != null) {
+ maskedSrc = maskedSrc.slice(0, match.index) + "++" + maskedSrc.slice(this.tokenizer.rules.inline.anyPunctuation.lastIndex);
}
+ let keepPrevChar = false;
+ let prevChar = "";
while (src) {
if (!keepPrevChar) {
prevChar = "";
}
keepPrevChar = false;
- if (this.options.extensions && this.options.extensions.inline && this.options.extensions.inline.some((extTokenizer) => {
+ let token;
+ if ((_b3 = (_a4 = this.options.extensions) == null ? void 0 : _a4.inline) == null ? void 0 : _b3.some((extTokenizer) => {
if (token = extTokenizer.call({ lexer: this }, src, tokens)) {
src = src.substring(token.raw.length);
tokens.push(token);
@@ -35849,13 +38416,7 @@
}
if (token = this.tokenizer.tag(src)) {
src = src.substring(token.raw.length);
- lastToken = tokens[tokens.length - 1];
- if (lastToken && token.type === "text" && lastToken.type === "text") {
- lastToken.raw += token.raw;
- lastToken.text += token.text;
- } else {
- tokens.push(token);
- }
+ tokens.push(token);
continue;
}
if (token = this.tokenizer.link(src)) {
@@ -35865,8 +38426,8 @@
}
if (token = this.tokenizer.reflink(src, this.tokens.links)) {
src = src.substring(token.raw.length);
- lastToken = tokens[tokens.length - 1];
- if (lastToken && token.type === "text" && lastToken.type === "text") {
+ const lastToken = tokens.at(-1);
+ if (token.type === "text" && (lastToken == null ? void 0 : lastToken.type) === "text") {
lastToken.raw += token.raw;
lastToken.text += token.text;
} else {
@@ -35894,22 +38455,22 @@
tokens.push(token);
continue;
}
- if (token = this.tokenizer.autolink(src, mangle)) {
+ if (token = this.tokenizer.autolink(src)) {
src = src.substring(token.raw.length);
tokens.push(token);
continue;
}
- if (!this.state.inLink && (token = this.tokenizer.url(src, mangle))) {
+ if (!this.state.inLink && (token = this.tokenizer.url(src))) {
src = src.substring(token.raw.length);
tokens.push(token);
continue;
}
- cutSrc = src;
- if (this.options.extensions && this.options.extensions.startInline) {
+ let cutSrc = src;
+ if ((_c2 = this.options.extensions) == null ? void 0 : _c2.startInline) {
let startIndex = Infinity;
const tempSrc = src.slice(1);
let tempStart;
- this.options.extensions.startInline.forEach(function(getStartIndex) {
+ this.options.extensions.startInline.forEach((getStartIndex) => {
tempStart = getStartIndex.call({ lexer: this }, tempSrc);
if (typeof tempStart === "number" && tempStart >= 0) {
startIndex = Math.min(startIndex, tempStart);
@@ -35919,14 +38480,14 @@
cutSrc = src.substring(0, startIndex + 1);
}
}
- if (token = this.tokenizer.inlineText(cutSrc, smartypants)) {
+ if (token = this.tokenizer.inlineText(cutSrc)) {
src = src.substring(token.raw.length);
if (token.raw.slice(-1) !== "_") {
prevChar = token.raw.slice(-1);
}
keepPrevChar = true;
- lastToken = tokens[tokens.length - 1];
- if (lastToken && lastToken.type === "text") {
+ const lastToken = tokens.at(-1);
+ if ((lastToken == null ? void 0 : lastToken.type) === "text") {
lastToken.raw += token.raw;
lastToken.text += token.text;
} else {
@@ -35947,305 +38508,295 @@
return tokens;
}
};
- var Renderer = class {
+ var _Renderer = class {
+ // set by the parser
constructor(options2) {
- this.options = options2 || defaults;
+ __publicField(this, "options");
+ __publicField(this, "parser");
+ this.options = options2 || _defaults;
}
- code(code, infostring, escaped) {
- const lang = (infostring || "").match(/\S*/)[0];
- if (this.options.highlight) {
- const out = this.options.highlight(code, lang);
- if (out != null && out !== code) {
- escaped = true;
- code = out;
- }
- }
- code = code.replace(/\n$/, "") + "\n";
- if (!lang) {
+ space(token) {
+ return "";
+ }
+ code({ text, lang, escaped }) {
+ var _a4;
+ const langString = (_a4 = (lang || "").match(other.notSpaceStart)) == null ? void 0 : _a4[0];
+ const code = text.replace(other.endingNewline, "") + "\n";
+ if (!langString) {
return "" + (escaped ? code : escape4(code, true)) + "
\n";
}
- return '' + (escaped ? code : escape4(code, true)) + "
\n";
- }
- blockquote(quote2) {
- return `
-${quote2}
-`;
- }
- html(html2) {
- return html2;
- }
- heading(text2, level, raw, slugger) {
- if (this.options.headerIds) {
- const id2 = this.options.headerPrefix + slugger.slug(raw);
- return `${text2}
-`;
+ return '' + (escaped ? code : escape4(code, true)) + "
\n";
+ }
+ blockquote({ tokens }) {
+ const body = this.parser.parse(tokens);
+ return "\n".concat(body, "
\n");
+ }
+ html({ text }) {
+ return text;
+ }
+ heading({ tokens, depth }) {
+ return "").concat(this.parser.parseInline(tokens), "\n");
+ }
+ hr(token) {
+ 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) {
+ var _a4;
+ let itemBody = "";
+ if (item.task) {
+ const checkbox = this.checkbox({ checked: !!item.checked });
+ if (item.loose) {
+ if (((_a4 = item.tokens[0]) == null ? void 0 : _a4.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 + " " + escape4(item.tokens[0].tokens[0].text);
+ item.tokens[0].tokens[0].escaped = true;
+ }
+ } else {
+ item.tokens.unshift({
+ type: "text",
+ raw: checkbox + " ",
+ text: checkbox + " ",
+ escaped: true
+ });
+ }
+ } else {
+ itemBody += checkbox + " ";
+ }
}
- return `${text2}
-`;
- }
- hr() {
- return this.options.xhtml ? "
\n" : "
\n";
- }
- list(body, ordered, start2) {
- const type3 = ordered ? "ol" : "ul", startatt = ordered && start2 !== 1 ? ' start="' + start2 + '"' : "";
- return "<" + type3 + startatt + ">\n" + body + "\n";
+ itemBody += this.parser.parse(item.tokens, !!item.loose);
+ return "".concat(itemBody, "\n");
}
- listitem(text2) {
- return `${text2}
-`;
+ checkbox({ checked }) {
+ return "';
}
- checkbox(checked) {
- return " ";
+ paragraph({ tokens }) {
+ return "".concat(this.parser.parseInline(tokens), "
\n");
}
- paragraph(text2) {
- return `${text2}
-`;
- }
- table(header, body) {
+ 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]);
+ }
+ body += this.tablerow({ text: cell });
+ }
if (body)
- body = `${body}`;
+ body = "".concat(body, "");
return "\n\n" + header + "\n" + body + "
\n";
}
- tablerow(content) {
- return `
-${content}
-`;
+ tablerow({ text }) {
+ return "\n".concat(text, "
\n");
}
- tablecell(content, flags) {
- const type3 = flags.header ? "th" : "td";
- const tag = flags.align ? `<${type3} align="${flags.align}">` : `<${type3}>`;
- return tag + content + `
-`;
+ tablecell(token) {
+ const content = this.parser.parseInline(token.tokens);
+ const type2 = token.header ? "th" : "td";
+ const tag2 = token.align ? "<".concat(type2, ' align="').concat(token.align, '">') : "<".concat(type2, ">");
+ return tag2 + content + "\n");
}
- strong(text2) {
- return `${text2}`;
+ /**
+ * span level renderer
+ */
+ strong({ tokens }) {
+ return "".concat(this.parser.parseInline(tokens), "");
}
- em(text2) {
- return `${text2}`;
+ em({ tokens }) {
+ return "".concat(this.parser.parseInline(tokens), "");
}
- codespan(text2) {
- return `${text2}`;
+ codespan({ text }) {
+ return "".concat(escape4(text, true), "");
}
- br() {
- return this.options.xhtml ? "
" : "
";
+ br(token) {
+ return "
";
}
- del(text2) {
- return `${text2}`;
+ del({ tokens }) {
+ return "".concat(this.parser.parseInline(tokens), "");
}
- link(href, title, text2) {
- href = cleanUrl(this.options.sanitize, this.options.baseUrl, href);
- if (href === null) {
- return text2;
+ link({ href, title, tokens }) {
+ const text = this.parser.parseInline(tokens);
+ const cleanHref = cleanUrl(href);
+ if (cleanHref === null) {
+ return text;
}
- let out = '";
+ out += ">" + text + "";
return out;
}
- image(href, title, text2) {
- href = cleanUrl(this.options.sanitize, this.options.baseUrl, href);
- if (href === null) {
- return text2;
+ image({ href, title, text }) {
+ const cleanHref = cleanUrl(href);
+ if (cleanHref === null) {
+ return escape4(text);
}
- let out = `
" : ">";
+ out += ">";
return out;
}
- text(text2) {
- return text2;
+ text(token) {
+ return "tokens" in token && token.tokens ? this.parser.parseInline(token.tokens) : "escaped" in token && token.escaped ? token.text : escape4(token.text);
}
};
- var TextRenderer = class {
- strong(text2) {
- return text2;
+ var _TextRenderer = class {
+ // no need for block level renderers
+ strong({ text }) {
+ return text;
}
- em(text2) {
- return text2;
+ em({ text }) {
+ return text;
}
- codespan(text2) {
- return text2;
+ codespan({ text }) {
+ return text;
}
- del(text2) {
- return text2;
+ del({ text }) {
+ return text;
}
- html(text2) {
- return text2;
+ html({ text }) {
+ return text;
}
- text(text2) {
- return text2;
+ text({ text }) {
+ return text;
}
- link(href, title, text2) {
- return "" + text2;
+ link({ text }) {
+ return "" + text;
}
- image(href, title, text2) {
- return "" + text2;
+ image({ text }) {
+ return "" + text;
}
br() {
return "";
}
};
- var Slugger = class {
- constructor() {
- this.seen = {};
- }
- serialize(value) {
- return value.toLowerCase().trim().replace(/<[!\/a-z].*?>/ig, "").replace(/[\u2000-\u206F\u2E00-\u2E7F\\'!"#$%&()*+,./:;<=>?@[\]^`{|}~]/g, "").replace(/\s/g, "-");
- }
- getNextSafeSlug(originalSlug, isDryRun) {
- let slug = originalSlug;
- let occurenceAccumulator = 0;
- if (this.seen.hasOwnProperty(slug)) {
- occurenceAccumulator = this.seen[originalSlug];
- do {
- occurenceAccumulator++;
- slug = originalSlug + "-" + occurenceAccumulator;
- } while (this.seen.hasOwnProperty(slug));
- }
- if (!isDryRun) {
- this.seen[originalSlug] = occurenceAccumulator;
- this.seen[slug] = 0;
- }
- return slug;
- }
- slug(value, options2 = {}) {
- const slug = this.serialize(value);
- return this.getNextSafeSlug(slug, options2.dryrun);
- }
- };
- var Parser = class {
+ var _Parser = class __Parser {
constructor(options2) {
- this.options = options2 || defaults;
- this.options.renderer = this.options.renderer || new Renderer();
+ __publicField(this, "options");
+ __publicField(this, "renderer");
+ __publicField(this, "textRenderer");
+ this.options = options2 || _defaults;
+ this.options.renderer = this.options.renderer || new _Renderer();
this.renderer = this.options.renderer;
this.renderer.options = this.options;
- this.textRenderer = new TextRenderer();
- this.slugger = new Slugger();
+ this.renderer.parser = this;
+ this.textRenderer = new _TextRenderer();
}
+ /**
+ * Static Parse Method
+ */
static parse(tokens, options2) {
- const parser3 = new Parser(options2);
+ const parser3 = new __Parser(options2);
return parser3.parse(tokens);
}
+ /**
+ * Static Parse Inline Method
+ */
static parseInline(tokens, options2) {
- const parser3 = new Parser(options2);
+ const parser3 = new __Parser(options2);
return parser3.parseInline(tokens);
}
+ /**
+ * Parse Loop
+ */
parse(tokens, top = true) {
- let out = "", i2, j2, k, l2, l3, row, cell, header, body, token, ordered, start2, loose, itemBody, item, checked, task, checkbox, ret;
- const l = tokens.length;
- for (i2 = 0; i2 < l; i2++) {
- token = tokens[i2];
- if (this.options.extensions && this.options.extensions.renderers && this.options.extensions.renderers[token.type]) {
- ret = this.options.extensions.renderers[token.type].call({ parser: this }, token);
- if (ret !== false || !["space", "hr", "heading", "code", "table", "blockquote", "list", "html", "paragraph", "text"].includes(token.type)) {
+ var _a4, _b3;
+ let out = "";
+ for (let i3 = 0; i3 < tokens.length; i3++) {
+ const anyToken = tokens[i3];
+ if ((_b3 = (_a4 = this.options.extensions) == null ? void 0 : _a4.renderers) == null ? void 0 : _b3[anyToken.type]) {
+ const genericToken = anyToken;
+ const ret = this.options.extensions.renderers[genericToken.type].call({ parser: this }, genericToken);
+ if (ret !== false || !["space", "hr", "heading", "code", "table", "blockquote", "list", "html", "paragraph", "text"].includes(genericToken.type)) {
out += ret || "";
continue;
}
}
+ const token = anyToken;
switch (token.type) {
case "space": {
+ out += this.renderer.space(token);
continue;
}
case "hr": {
- out += this.renderer.hr();
+ out += this.renderer.hr(token);
continue;
}
case "heading": {
- out += this.renderer.heading(this.parseInline(token.tokens), token.depth, unescape3(this.parseInline(token.tokens, this.textRenderer)), this.slugger);
+ out += this.renderer.heading(token);
continue;
}
case "code": {
- out += this.renderer.code(token.text, token.lang, token.escaped);
+ out += this.renderer.code(token);
continue;
}
case "table": {
- header = "";
- cell = "";
- l2 = token.header.length;
- for (j2 = 0; j2 < l2; j2++) {
- cell += this.renderer.tablecell(this.parseInline(token.header[j2].tokens), { header: true, align: token.align[j2] });
- }
- header += this.renderer.tablerow(cell);
- body = "";
- l2 = token.rows.length;
- for (j2 = 0; j2 < l2; j2++) {
- row = token.rows[j2];
- cell = "";
- l3 = row.length;
- for (k = 0; k < l3; k++) {
- cell += this.renderer.tablecell(this.parseInline(row[k].tokens), { header: false, align: token.align[k] });
- }
- body += this.renderer.tablerow(cell);
- }
- out += this.renderer.table(header, body);
+ out += this.renderer.table(token);
continue;
}
case "blockquote": {
- body = this.parse(token.tokens);
- out += this.renderer.blockquote(body);
+ out += this.renderer.blockquote(token);
continue;
}
case "list": {
- ordered = token.ordered;
- start2 = token.start;
- loose = token.loose;
- l2 = token.items.length;
- body = "";
- for (j2 = 0; j2 < l2; j2++) {
- item = token.items[j2];
- checked = item.checked;
- task = item.task;
- itemBody = "";
- if (item.task) {
- checkbox = this.renderer.checkbox(checked);
- if (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",
- text: checkbox
- });
- }
- } else {
- itemBody += checkbox;
- }
- }
- itemBody += this.parse(item.tokens, loose);
- body += this.renderer.listitem(itemBody, task, checked);
- }
- out += this.renderer.list(body, ordered, start2);
+ out += this.renderer.list(token);
continue;
}
case "html": {
- out += this.renderer.html(token.text);
+ out += this.renderer.html(token);
continue;
}
case "paragraph": {
- out += this.renderer.paragraph(this.parseInline(token.tokens));
+ out += this.renderer.paragraph(token);
continue;
}
case "text": {
- body = token.tokens ? this.parseInline(token.tokens) : token.text;
- while (i2 + 1 < l && tokens[i2 + 1].type === "text") {
- token = tokens[++i2];
- body += "\n" + (token.tokens ? this.parseInline(token.tokens) : token.text);
+ let textToken = token;
+ let body = this.renderer.text(textToken);
+ while (i3 + 1 < tokens.length && tokens[i3 + 1].type === "text") {
+ textToken = tokens[++i3];
+ body += "\n" + this.renderer.text(textToken);
+ }
+ if (top) {
+ out += this.renderer.paragraph({
+ type: "paragraph",
+ raw: body,
+ text: body,
+ tokens: [{ type: "text", raw: body, text: body, escaped: true }]
+ });
+ } else {
+ out += body;
}
- out += top ? this.renderer.paragraph(body) : body;
continue;
}
default: {
const errMsg = 'Token with "' + token.type + '" type was not found.';
if (this.options.silent) {
console.error(errMsg);
- return;
+ return "";
} else {
throw new Error(errMsg);
}
@@ -36254,65 +38805,68 @@ ${content}
}
return out;
}
- parseInline(tokens, renderer) {
- renderer = renderer || this.renderer;
- let out = "", i2, token, ret;
- const l = tokens.length;
- for (i2 = 0; i2 < l; i2++) {
- token = tokens[i2];
- if (this.options.extensions && this.options.extensions.renderers && this.options.extensions.renderers[token.type]) {
- ret = this.options.extensions.renderers[token.type].call({ parser: this }, token);
- if (ret !== false || !["escape", "html", "link", "image", "strong", "em", "codespan", "br", "del", "text"].includes(token.type)) {
+ /**
+ * Parse Inline Tokens
+ */
+ parseInline(tokens, renderer = this.renderer) {
+ var _a4, _b3;
+ let out = "";
+ for (let i3 = 0; i3 < tokens.length; i3++) {
+ const anyToken = tokens[i3];
+ if ((_b3 = (_a4 = this.options.extensions) == null ? void 0 : _a4.renderers) == null ? void 0 : _b3[anyToken.type]) {
+ const ret = this.options.extensions.renderers[anyToken.type].call({ parser: this }, anyToken);
+ if (ret !== false || !["escape", "html", "link", "image", "strong", "em", "codespan", "br", "del", "text"].includes(anyToken.type)) {
out += ret || "";
continue;
}
}
+ const token = anyToken;
switch (token.type) {
case "escape": {
- out += renderer.text(token.text);
+ out += renderer.text(token);
break;
}
case "html": {
- out += renderer.html(token.text);
+ out += renderer.html(token);
break;
}
case "link": {
- out += renderer.link(token.href, token.title, this.parseInline(token.tokens, renderer));
+ out += renderer.link(token);
break;
}
case "image": {
- out += renderer.image(token.href, token.title, token.text);
+ out += renderer.image(token);
break;
}
case "strong": {
- out += renderer.strong(this.parseInline(token.tokens, renderer));
+ out += renderer.strong(token);
break;
}
case "em": {
- out += renderer.em(this.parseInline(token.tokens, renderer));
+ out += renderer.em(token);
break;
}
case "codespan": {
- out += renderer.codespan(token.text);
+ out += renderer.codespan(token);
break;
}
case "br": {
- out += renderer.br();
+ out += renderer.br(token);
break;
}
case "del": {
- out += renderer.del(this.parseInline(token.tokens, renderer));
+ out += renderer.del(token);
break;
}
case "text": {
- out += renderer.text(token.text);
+ out += renderer.text(token);
break;
}
default: {
const errMsg = 'Token with "' + token.type + '" type was not found.';
if (this.options.silent) {
console.error(errMsg);
- return;
+ return "";
} else {
throw new Error(errMsg);
}
@@ -36322,371 +38876,472 @@ ${content}
return out;
}
};
- function marked(src, opt, callback) {
- if (typeof src === "undefined" || src === null) {
- throw new Error("marked(): input parameter is undefined or null");
- }
- if (typeof src !== "string") {
- throw new Error("marked(): input parameter is of type " + Object.prototype.toString.call(src) + ", string expected");
- }
- if (typeof opt === "function") {
- callback = opt;
- opt = null;
- }
- opt = merge2({}, marked.defaults, opt || {});
- checkSanitizeDeprecation(opt);
- if (callback) {
- const highlight = opt.highlight;
- let tokens;
- try {
- tokens = Lexer.lex(src, opt);
- } catch (e) {
- return callback(e);
- }
- const done = function(err) {
- let out;
- if (!err) {
- try {
- if (opt.walkTokens) {
- marked.walkTokens(tokens, opt.walkTokens);
+ var _Hooks = class {
+ constructor(options2) {
+ __publicField(this, "options");
+ __publicField(this, "block");
+ this.options = options2 || _defaults;
+ }
+ /**
+ * Process markdown before marked
+ */
+ preprocess(markdown) {
+ return markdown;
+ }
+ /**
+ * Process HTML after marked is finished
+ */
+ postprocess(html3) {
+ return html3;
+ }
+ /**
+ * Process all tokens before walk tokens
+ */
+ processAllTokens(tokens) {
+ return tokens;
+ }
+ /**
+ * Provide function to tokenize markdown
+ */
+ provideLexer() {
+ return this.block ? _Lexer.lex : _Lexer.lexInline;
+ }
+ /**
+ * Provide function to parse tokens
+ */
+ provideParser() {
+ return this.block ? _Parser.parse : _Parser.parseInline;
+ }
+ };
+ __publicField(_Hooks, "passThroughHooks", /* @__PURE__ */ new Set([
+ "preprocess",
+ "postprocess",
+ "processAllTokens"
+ ]));
+ var Marked = class {
+ constructor(...args) {
+ __publicField(this, "defaults", _getDefaults());
+ __publicField(this, "options", this.setOptions);
+ __publicField(this, "parse", this.parseMarkdown(true));
+ __publicField(this, "parseInline", this.parseMarkdown(false));
+ __publicField(this, "Parser", _Parser);
+ __publicField(this, "Renderer", _Renderer);
+ __publicField(this, "TextRenderer", _TextRenderer);
+ __publicField(this, "Lexer", _Lexer);
+ __publicField(this, "Tokenizer", _Tokenizer);
+ __publicField(this, "Hooks", _Hooks);
+ this.use(...args);
+ }
+ /**
+ * Run callback for every token
+ */
+ walkTokens(tokens, callback) {
+ var _a4, _b3;
+ let values = [];
+ for (const token of tokens) {
+ values = values.concat(callback.call(this, token));
+ switch (token.type) {
+ case "table": {
+ const tableToken = token;
+ for (const cell of tableToken.header) {
+ values = values.concat(this.walkTokens(cell.tokens, callback));
+ }
+ for (const row of tableToken.rows) {
+ for (const cell of row) {
+ values = values.concat(this.walkTokens(cell.tokens, callback));
+ }
+ }
+ break;
+ }
+ case "list": {
+ const listToken = token;
+ values = values.concat(this.walkTokens(listToken.items, callback));
+ break;
+ }
+ default: {
+ const genericToken = token;
+ if ((_b3 = (_a4 = this.defaults.extensions) == null ? void 0 : _a4.childTokens) == null ? void 0 : _b3[genericToken.type]) {
+ this.defaults.extensions.childTokens[genericToken.type].forEach((childTokens) => {
+ const tokens2 = genericToken[childTokens].flat(Infinity);
+ values = values.concat(this.walkTokens(tokens2, callback));
+ });
+ } else if (genericToken.tokens) {
+ values = values.concat(this.walkTokens(genericToken.tokens, callback));
}
- out = Parser.parse(tokens, opt);
- } catch (e) {
- err = e;
}
}
- opt.highlight = highlight;
- return err ? callback(err) : callback(null, out);
- };
- if (!highlight || highlight.length < 3) {
- return done();
- }
- delete opt.highlight;
- if (!tokens.length)
- return done();
- let pending = 0;
- marked.walkTokens(tokens, function(token) {
- if (token.type === "code") {
- pending++;
- setTimeout(() => {
- highlight(token.text, token.lang, function(err, code) {
- if (err) {
- return done(err);
+ }
+ return values;
+ }
+ use(...args) {
+ const extensions = this.defaults.extensions || { renderers: {}, childTokens: {} };
+ args.forEach((pack) => {
+ const opts = __spreadValues({}, pack);
+ opts.async = this.defaults.async || opts.async || false;
+ if (pack.extensions) {
+ pack.extensions.forEach((ext) => {
+ if (!ext.name) {
+ throw new Error("extension name required");
+ }
+ if ("renderer" in ext) {
+ const prevRenderer = extensions.renderers[ext.name];
+ 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 (code != null && code !== token.text) {
- token.text = code;
- token.escaped = true;
+ }
+ if ("tokenizer" in ext) {
+ if (!ext.level || ext.level !== "block" && ext.level !== "inline") {
+ throw new Error("extension level must be 'block' or 'inline'");
}
- pending--;
- if (pending === 0) {
- done();
+ const extLevel = extensions[ext.level];
+ if (extLevel) {
+ extLevel.unshift(ext.tokenizer);
+ } else {
+ extensions[ext.level] = [ext.tokenizer];
}
- });
- }, 0);
- }
- });
- if (pending === 0) {
- done();
- }
- return;
- }
- try {
- const tokens = Lexer.lex(src, opt);
- if (opt.walkTokens) {
- marked.walkTokens(tokens, opt.walkTokens);
- }
- return Parser.parse(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) + "
";
- }
- throw e;
- }
- }
- 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);
+ 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];
+ }
}
- return ret;
- };
- } else {
- extensions.renderers[ext.name] = ext.renderer;
+ }
+ }
+ if ("childTokens" in ext && ext.childTokens) {
+ extensions.childTokens[ext.name] = ext.childTokens;
+ }
+ });
+ opts.extensions = extensions;
+ }
+ if (pack.renderer) {
+ const renderer = this.defaults.renderer || new _Renderer(this.defaults);
+ for (const prop in pack.renderer) {
+ if (!(prop in renderer)) {
+ throw new Error("renderer '".concat(prop, "' does not exist"));
+ }
+ if (["options", "parser"].includes(prop)) {
+ continue;
}
+ const rendererProp = prop;
+ const rendererFunc = pack.renderer[rendererProp];
+ const prevRenderer = renderer[rendererProp];
+ renderer[rendererProp] = (...args2) => {
+ let ret = rendererFunc.apply(renderer, args2);
+ if (ret === false) {
+ ret = prevRenderer.apply(renderer, args2);
+ }
+ return ret || "";
+ };
}
- if (ext.tokenizer) {
- if (!ext.level || ext.level !== "block" && ext.level !== "inline") {
- throw new Error("extension level must be 'block' or 'inline'");
+ opts.renderer = renderer;
+ }
+ if (pack.tokenizer) {
+ const tokenizer = this.defaults.tokenizer || new _Tokenizer(this.defaults);
+ for (const prop in pack.tokenizer) {
+ if (!(prop in tokenizer)) {
+ throw new Error("tokenizer '".concat(prop, "' does not exist"));
}
- if (extensions[ext.level]) {
- extensions[ext.level].unshift(ext.tokenizer);
- } else {
- extensions[ext.level] = [ext.tokenizer];
+ if (["options", "rules", "lexer"].includes(prop)) {
+ continue;
}
- if (ext.start) {
- if (ext.level === "block") {
- if (extensions.startBlock) {
- extensions.startBlock.push(ext.start);
- } else {
- extensions.startBlock = [ext.start];
+ const tokenizerProp = prop;
+ const tokenizerFunc = pack.tokenizer[tokenizerProp];
+ const prevTokenizer = tokenizer[tokenizerProp];
+ tokenizer[tokenizerProp] = (...args2) => {
+ let ret = tokenizerFunc.apply(tokenizer, args2);
+ if (ret === false) {
+ ret = prevTokenizer.apply(tokenizer, args2);
+ }
+ return ret;
+ };
+ }
+ opts.tokenizer = tokenizer;
+ }
+ if (pack.hooks) {
+ const hooks = this.defaults.hooks || new _Hooks();
+ for (const prop in pack.hooks) {
+ if (!(prop in hooks)) {
+ throw new Error("hook '".concat(prop, "' does not exist"));
+ }
+ if (["options", "block"].includes(prop)) {
+ continue;
+ }
+ const hooksProp = prop;
+ const hooksFunc = pack.hooks[hooksProp];
+ const prevHook = hooks[hooksProp];
+ if (_Hooks.passThroughHooks.has(prop)) {
+ hooks[hooksProp] = (arg) => {
+ if (this.defaults.async) {
+ return Promise.resolve(hooksFunc.call(hooks, arg)).then((ret2) => {
+ return prevHook.call(hooks, ret2);
+ });
}
- } else if (ext.level === "inline") {
- if (extensions.startInline) {
- extensions.startInline.push(ext.start);
- } else {
- extensions.startInline = [ext.start];
+ const ret = hooksFunc.call(hooks, arg);
+ return prevHook.call(hooks, ret);
+ };
+ } else {
+ hooks[hooksProp] = (...args2) => {
+ let ret = hooksFunc.apply(hooks, args2);
+ if (ret === false) {
+ ret = prevHook.apply(hooks, args2);
}
- }
+ return ret;
+ };
}
}
- if (ext.childTokens) {
- extensions.childTokens[ext.name] = ext.childTokens;
- }
- });
- }
- 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.hooks = hooks;
}
- 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);
+ if (pack.walkTokens) {
+ const walkTokens2 = this.defaults.walkTokens;
+ const packWalktokens = pack.walkTokens;
+ opts.walkTokens = function(token) {
+ let values = [];
+ values.push(packWalktokens.call(this, token));
+ if (walkTokens2) {
+ values = values.concat(walkTokens2.call(this, token));
}
- return ret;
+ return values;
};
}
- opts.tokenizer = tokenizer;
- }
- if (pack.walkTokens) {
- const walkTokens2 = marked.defaults.walkTokens;
- opts.walkTokens = function(token) {
- pack.walkTokens.call(this, token);
- if (walkTokens2) {
- walkTokens2.call(this, token);
+ this.defaults = __spreadValues(__spreadValues({}, this.defaults), opts);
+ });
+ return this;
+ }
+ setOptions(opt) {
+ this.defaults = __spreadValues(__spreadValues({}, this.defaults), opt);
+ return this;
+ }
+ lexer(src, options2) {
+ return _Lexer.lex(src, options2 != null ? options2 : this.defaults);
+ }
+ parser(tokens, options2) {
+ return _Parser.parse(tokens, options2 != null ? options2 : this.defaults);
+ }
+ parseMarkdown(blockType) {
+ const parse = (src, options2) => {
+ const origOpt = __spreadValues({}, options2);
+ const opt = __spreadValues(__spreadValues({}, this.defaults), origOpt);
+ const throwError = this.onError(!!opt.silent, !!opt.async);
+ if (this.defaults.async === true && origOpt.async === false) {
+ return throwError(new Error("marked(): The async option was set to true by an extension. Remove async: false from the parse options object to return a Promise."));
+ }
+ if (typeof src === "undefined" || src === null) {
+ return throwError(new Error("marked(): input parameter is undefined or null"));
+ }
+ if (typeof src !== "string") {
+ return throwError(new Error("marked(): input parameter is of type " + Object.prototype.toString.call(src) + ", string expected"));
+ }
+ if (opt.hooks) {
+ opt.hooks.options = opt;
+ opt.hooks.block = blockType;
+ }
+ const lexer2 = opt.hooks ? opt.hooks.provideLexer() : blockType ? _Lexer.lex : _Lexer.lexInline;
+ const parser3 = opt.hooks ? opt.hooks.provideParser() : blockType ? _Parser.parse : _Parser.parseInline;
+ if (opt.async) {
+ return Promise.resolve(opt.hooks ? opt.hooks.preprocess(src) : src).then((src2) => lexer2(src2, opt)).then((tokens) => opt.hooks ? opt.hooks.processAllTokens(tokens) : tokens).then((tokens) => opt.walkTokens ? Promise.all(this.walkTokens(tokens, opt.walkTokens)).then(() => tokens) : tokens).then((tokens) => parser3(tokens, opt)).then((html3) => opt.hooks ? opt.hooks.postprocess(html3) : html3).catch(throwError);
+ }
+ try {
+ if (opt.hooks) {
+ src = opt.hooks.preprocess(src);
}
- };
- }
- if (hasExtensions) {
- opts.extensions = extensions;
- }
- marked.setOptions(opts);
- });
- };
- marked.walkTokens = function(tokens, callback) {
- for (const token of tokens) {
- callback.call(marked, token);
- switch (token.type) {
- case "table": {
- for (const cell of token.header) {
- marked.walkTokens(cell.tokens, callback);
+ let tokens = lexer2(src, opt);
+ if (opt.hooks) {
+ tokens = opt.hooks.processAllTokens(tokens);
}
- for (const row of token.rows) {
- for (const cell of row) {
- marked.walkTokens(cell.tokens, callback);
- }
+ if (opt.walkTokens) {
+ this.walkTokens(tokens, opt.walkTokens);
}
- break;
- }
- case "list": {
- marked.walkTokens(token.items, callback);
- break;
+ let html3 = parser3(tokens, opt);
+ if (opt.hooks) {
+ html3 = opt.hooks.postprocess(html3);
+ }
+ return html3;
+ } catch (e3) {
+ return throwError(e3);
}
- default: {
- if (marked.defaults.extensions && marked.defaults.extensions.childTokens && marked.defaults.extensions.childTokens[token.type]) {
- marked.defaults.extensions.childTokens[token.type].forEach(function(childTokens) {
- marked.walkTokens(token[childTokens], callback);
- });
- } else if (token.tokens) {
- marked.walkTokens(token.tokens, callback);
+ };
+ return parse;
+ }
+ onError(silent, async) {
+ return (e3) => {
+ e3.message += "\nPlease report this to https://github.com/markedjs/marked.";
+ if (silent) {
+ const msg = "An error occurred:
" + escape4(e3.message + "", true) + "
";
+ if (async) {
+ return Promise.resolve(msg);
}
+ return msg;
}
- }
+ if (async) {
+ return Promise.reject(e3);
+ }
+ throw e3;
+ };
}
};
- 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");
- }
- opt = merge2({}, marked.defaults, opt || {});
- checkSanitizeDeprecation(opt);
- try {
- const tokens = Lexer.lexInline(src, opt);
- if (opt.walkTokens) {
- marked.walkTokens(tokens, opt.walkTokens);
- }
- 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) + "
";
- }
- throw e;
- }
+ 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.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.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;
+ var parser2 = _Parser.parse;
+ var lexer = _Lexer.lex;
// modules/services/osmose.js
- var tiler3 = utilTiler();
- var dispatch4 = dispatch_default("loaded");
- var _tileZoom3 = 14;
+ 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 _cache3;
- function abortRequest3(controller) {
+ var _cache2;
+ function abortRequest2(controller) {
if (controller) {
controller.abort();
}
}
- function abortUnwantedRequests3(cache, tiles) {
- Object.keys(cache.inflightTile).forEach((k) => {
- let wanted = tiles.find((tile) => k === tile.id);
+ function abortUnwantedRequests2(cache, tiles) {
+ Object.keys(cache.inflightTile).forEach((k2) => {
+ let wanted = tiles.find((tile) => k2 === tile.id);
if (!wanted) {
- abortRequest3(cache.inflightTile[k]);
- delete cache.inflightTile[k];
+ abortRequest2(cache.inflightTile[k2]);
+ delete cache.inflightTile[k2];
}
});
}
- function encodeIssueRtree3(d) {
- return { minX: d.loc[0], minY: d.loc[1], maxX: d.loc[0], maxY: d.loc[1], data: d };
+ function encodeIssueRtree2(d2) {
+ return { minX: d2.loc[0], minY: d2.loc[1], maxX: d2.loc[0], maxY: d2.loc[1], data: d2 };
}
- function updateRtree3(item, replace) {
- _cache3.rtree.remove(item, (a, b) => a.data.id === b.data.id);
+ function updateRtree2(item, replace) {
+ _cache2.rtree.remove(item, (a2, b2) => a2.data.id === b2.data.id);
if (replace) {
- _cache3.rtree.insert(item);
+ _cache2.rtree.insert(item);
}
}
- function preventCoincident2(loc) {
+ function preventCoincident(loc) {
let coincident = false;
do {
let delta = coincident ? [1e-5, 0] : [0, 1e-5];
loc = geoVecAdd(loc, delta);
- let bbox = geoExtent(loc).bbox();
- coincident = _cache3.rtree.search(bbox).length;
+ 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((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], []);
+ _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], []);
});
- if (!_cache3) {
+ if (!_cache2) {
this.reset();
}
- this.event = utilRebind(this, dispatch4, "on");
+ this.event = utilRebind(this, dispatch3, "on");
},
reset() {
let _strings = {};
let _colors = {};
- if (_cache3) {
- Object.values(_cache3.inflightTile).forEach(abortRequest3);
- _strings = _cache3.strings;
- _colors = _cache3.colors;
+ if (_cache2) {
+ Object.values(_cache2.inflightTile).forEach(abortRequest2);
+ _strings = _cache2.strings;
+ _colors = _cache2.colors;
}
- _cache3 = {
+ _cache2 = {
data: {},
loadedTile: {},
inflightTile: {},
inflightPost: {},
closed: {},
- rtree: new import_rbush3.default(),
+ 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 = tiler3.zoomExtent([_tileZoom3, _tileZoom3]).getTiles(projection2);
- abortUnwantedRequests3(_cache3, tiles);
+ let tiles = tiler2.zoomExtent([_tileZoom2, _tileZoom2]).getTiles(projection2);
+ abortUnwantedRequests2(_cache2, 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}.json?` + utilQsString(params);
+ 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();
- _cache3.inflightTile[tile.id] = controller;
+ _cache2.inflightTile[tile.id] = controller;
json_default(url, { signal: controller.signal }).then((data) => {
- delete _cache3.inflightTile[tile.id];
- _cache3.loadedTile[tile.id] = true;
+ 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 = `${item}-${cl}`;
+ const itemType = "".concat(item, "-").concat(cl);
if (itemType in _osmoseData.icons) {
let loc = issue.geometry.coordinates;
- loc = preventCoincident2(loc);
- let d = new QAItem(loc, this, itemType, id2, { item });
+ loc = preventCoincident(loc);
+ let d2 = new QAItem(loc, this, itemType, id2, { item });
if (item === 8300 || item === 8360) {
- d.elems = [];
+ d2.elems = [];
}
- _cache3.data[d.id] = d;
- _cache3.rtree.insert(encodeIssueRtree3(d));
+ _cache2.data[d2.id] = d2;
+ _cache2.rtree.insert(encodeIssueRtree2(d2));
}
});
}
- dispatch4.call("loaded");
+ dispatch3.call("loaded");
}).catch(() => {
- delete _cache3.inflightTile[tile.id];
- _cache3.loadedTile[tile.id] = true;
+ delete _cache2.inflightTile[tile.id];
+ _cache2.loadedTile[tile.id] = true;
});
});
},
@@ -36694,9 +39349,9 @@ ${content}
if (issue.elems !== void 0) {
return Promise.resolve(issue);
}
- const url = `${_osmoseUrlRoot}/issue/${issue.id}?langs=${_mainLocalizer.localeCode()}`;
+ const url = "".concat(_osmoseUrlRoot, "/issue/").concat(issue.id, "?langs=").concat(_mainLocalizer.localeCode());
const cacheDetails = (data) => {
- issue.elems = data.elems.map((e) => e.type.substring(0, 1) + e.id);
+ issue.elems = data.elems.map((e3) => e3.type.substring(0, 1) + e3.id);
issue.detail = data.subtitle ? marked(data.subtitle.auto) : "";
this.replaceItem(issue);
};
@@ -36704,124 +39359,1326 @@ ${content}
},
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]);
+ if (locale2 in _cache2.strings && Object.keys(_cache2.strings[locale2]).length === items.length) {
+ return Promise.resolve(_cache2.strings[locale2]);
}
- if (!(locale2 in _cache3.strings)) {
- _cache3.strings[locale2] = {};
+ if (!(locale2 in _cache2.strings)) {
+ _cache2.strings[locale2] = {};
}
const allRequests = items.map((itemType) => {
- if (itemType in _cache3.strings[locale2])
- return null;
+ 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 (${itemType}) had unexpected data`);
+ 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)) {
- _cache3.colors[itemInt] = 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);
- _cache3.strings[locale2][itemType] = 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 = `${_osmoseUrlRoot}/items/${item}/class/${cl}?langs=${locale2}`;
+ 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(() => _cache3.strings[locale2]);
+ return Promise.all(allRequests).then(() => _cache2.strings[locale2]);
},
getStrings(itemType, locale2 = _mainLocalizer.localeCode()) {
- return locale2 in _cache3.strings ? _cache3.strings[locale2][itemType] : {};
+ return locale2 in _cache2.strings ? _cache2.strings[locale2][itemType] : {};
},
getColor(itemType) {
- return itemType in _cache3.colors ? _cache3.colors[itemType] : "#FFFFFF";
+ return itemType in _cache2.colors ? _cache2.colors[itemType] : "#FFFFFF";
},
postUpdate(issue, callback) {
- if (_cache3.inflightPost[issue.id]) {
+ if (_cache2.inflightPost[issue.id]) {
return callback({ message: "Issue update already inflight", status: -2 }, issue);
}
- const url = `${_osmoseUrlRoot}/issue/${issue.id}/${issue.newStatus}`;
+ const url = "".concat(_osmoseUrlRoot, "/issue/").concat(issue.id, "/").concat(issue.newStatus);
const controller = new AbortController();
const after = () => {
- delete _cache3.inflightPost[issue.id];
+ delete _cache2.inflightPost[issue.id];
this.removeItem(issue);
if (issue.newStatus === "done") {
- if (!(issue.item in _cache3.closed)) {
- _cache3.closed[issue.item] = 0;
+ if (!(issue.item in _cache2.closed)) {
+ _cache2.closed[issue.item] = 0;
}
- _cache3.closed[issue.item] += 1;
+ _cache2.closed[issue.item] += 1;
}
- if (callback)
- callback(null, issue);
+ if (callback) callback(null, issue);
};
- _cache3.inflightPost[issue.id] = controller;
+ _cache2.inflightPost[issue.id] = controller;
fetch(url, { signal: controller.signal }).then(after).catch((err) => {
- delete _cache3.inflightPost[issue.id];
- if (callback)
- callback(err.message);
+ delete _cache2.inflightPost[issue.id];
+ if (callback) callback(err.message);
});
},
+ // 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 bbox = geoExtent(projection2.invert(min3), projection2.invert(max3)).bbox();
- return _cache3.rtree.search(bbox).map((d) => d.data);
+ 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 _cache3.data[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;
- _cache3.data[item.id] = item;
- updateRtree3(encodeIssueRtree3(item), true);
+ 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 _cache3.data[item.id];
- updateRtree3(encodeIssueRtree3(item), false);
+ 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 _cache3.closed;
+ return _cache2.closed;
},
itemURL(item) {
- return `https://osmose.openstreetmap.fr/en/error/${item.id}`;
+ return "https://osmose.openstreetmap.fr/en/error/".concat(item.id);
+ }
+ };
+
+ // 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;
+ }
+ /**
+ * @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 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 {
+ 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;
+ }
+
+ // 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(other2) {
+ return this.x === other2.x && this.y === other2.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");
};
+ // 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
+ ];
+ }
+ 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");
+ }
+ const result = {
+ type: "Feature",
+ geometry,
+ properties: this.properties
+ };
+ if (this.id != null) {
+ result.id = this.id;
+ }
+ return result;
+ }
+ };
+ 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 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;
+ }
+ 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 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 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 dispatch5 = dispatch_default("change", "loadedImages", "loadedSigns", "loadedMapFeatures", "bearingChanged", "imageChanged");
+ var dispatch4 = dispatch_default("change", "loadedImages", "loadedSigns", "loadedMapFeatures", "bearingChanged", "imageChanged");
var _loadViewerPromise;
var _mlyActiveImage;
var _mlyCache;
@@ -36831,6 +40688,7 @@ ${content}
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);
@@ -36840,9 +40698,8 @@ ${content}
}
function loadTile(which, url, tile) {
const cache = _mlyCache.requests;
- const tileId = `${tile.id}-${which}`;
- if (cache.loaded[tileId] || cache.inflight[tileId])
- return;
+ 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]);
@@ -36859,11 +40716,11 @@ ${content}
}
loadTileDataToCache(data, tile, which);
if (which === "images") {
- dispatch5.call("loadedImages");
+ dispatch4.call("loadedImages");
} else if (which === "signs") {
- dispatch5.call("loadedSigns");
+ dispatch4.call("loadedSigns");
} else if (which === "points") {
- dispatch5.call("loadedMapFeatures");
+ dispatch4.call("loadedMapFeatures");
}
}).catch(function() {
cache.loaded[tileId] = true;
@@ -36871,16 +40728,16 @@ ${content}
});
}
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;
+ const vectorTile = new VectorTile(new Pbf(data));
+ let features, cache, layer, i3, feature3, loc, d2;
if (vectorTile.layers.hasOwnProperty("image")) {
- features2 = [];
+ features = [];
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]);
+ 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;
- d = {
+ d2 = {
loc,
captured_at: feature3.properties.captured_at,
ca: feature3.properties.compass_angle,
@@ -36888,25 +40745,25 @@ ${content}
is_pano: feature3.properties.is_pano,
sequence_id: feature3.properties.sequence_id
};
- cache.forImageId[d.id] = d;
- features2.push({
+ cache.forImageId[d2.id] = d2;
+ features.push({
minX: loc[0],
minY: loc[1],
maxX: loc[0],
maxY: loc[1],
- data: d
+ data: d2
});
}
if (cache.rtree) {
- cache.rtree.load(features2);
+ cache.rtree.load(features);
}
}
if (vectorTile.layers.hasOwnProperty("sequence")) {
- features2 = [];
+ features = [];
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]);
+ 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 {
@@ -36915,55 +40772,55 @@ ${content}
}
}
if (vectorTile.layers.hasOwnProperty("point")) {
- features2 = [];
+ features = [];
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]);
+ 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;
- d = {
+ 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
};
- features2.push({
+ features.push({
minX: loc[0],
minY: loc[1],
maxX: loc[0],
maxY: loc[1],
- data: d
+ data: d2
});
}
if (cache.rtree) {
- cache.rtree.load(features2);
+ cache.rtree.load(features);
}
}
if (vectorTile.layers.hasOwnProperty("traffic_sign")) {
- features2 = [];
+ features = [];
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]);
+ 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;
- d = {
+ 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
};
- features2.push({
+ features.push({
minX: loc[0],
minY: loc[1],
maxX: loc[0],
maxY: loc[1],
- data: d
+ data: d2
});
}
if (cache.rtree) {
- cache.rtree.load(features2);
+ cache.rtree.load(features);
}
}
}
@@ -36981,9 +40838,9 @@ ${content}
});
}
function partitionViewport(projection2) {
- const z = geoScaleToZoom(projection2.scale());
- const z2 = Math.ceil(z * 2) / 2 + 2.5;
- const tiler8 = utilTiler().zoomExtent([z2, z2]);
+ 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;
});
@@ -36991,19 +40848,21 @@ ${content}
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;
+ 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, dispatch5, "on");
+ this.event = utilRebind(this, dispatch4, "on");
},
+ // Reset cache and state
reset: function() {
if (_mlyCache) {
Object.values(_mlyCache.requests.inflight).forEach(function(request3) {
@@ -37011,40 +40870,45 @@ ${content}
});
}
_mlyCache = {
- images: { rtree: new import_rbush4.default(), forImageId: {} },
+ images: { rtree: new RBush(), forImageId: {} },
image_detections: { forImageId: {} },
- signs: { rtree: new import_rbush4.default() },
- points: { rtree: new import_rbush4.default() },
- sequences: { rtree: new import_rbush4.default(), lineString: {} },
+ 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 bbox = geoExtent(projection2.invert(min3), projection2.invert(max3)).bbox();
+ const bbox2 = geoExtent(projection2.invert(min3), projection2.invert(max3)).bbox();
const sequenceIds = {};
let lineStrings = [];
- _mlyCache.images.rtree.search(bbox).forEach(function(d) {
- if (d.data.sequence_id) {
- sequenceIds[d.data.sequence_id] = true;
+ _mlyCache.images.rtree.search(bbox2).forEach(function(d2) {
+ if (d2.data.sequence_id) {
+ sequenceIds[d2.data.sequence_id] = true;
}
});
Object.keys(sequenceIds).forEach(function(sequenceId) {
@@ -37054,18 +40918,21 @@ ${content}
});
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;
+ 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;
@@ -37073,8 +40940,7 @@ ${content}
let loadedCount = 0;
function loaded() {
loadedCount += 1;
- if (loadedCount === 2)
- resolve();
+ if (loadedCount === 2) resolve();
}
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() {
@@ -37090,41 +40956,53 @@ ${content}
});
return _loadViewerPromise;
},
+ // Load traffic sign image sprites
loadSignResources: function(context) {
- context.ui().svgDefs.addSprites(["mapillary-sprite"], false);
+ 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);
+ 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 (!showsPano) filter2.push(["!=", "cameraType", "spherical"]);
+ if (!showsFlat && showsPano) filter2.push(["==", "pano", true]);
if (fromDate) {
filter2.push([">=", "capturedAt", new Date(fromDate).getTime()]);
}
@@ -37137,6 +41015,7 @@ ${content}
_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();
@@ -37145,44 +41024,52 @@ ${content}
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);
+ 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");
+ 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);
+ const hash2 = utilStringQs(window.location.hash);
if (imageId) {
- hash.photo = "mapillary/" + imageId;
+ hash2.photo = "mapillary/" + imageId;
} else {
- delete hash.photo;
+ delete hash2.photo;
}
- window.location.replace("#" + utilQsString(hash, true));
+ window.location.replace("#" + utilQsString(hash2, 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;
+ if (!window.mapillary) return;
const opts = {
accessToken,
component: {
@@ -37203,7 +41090,9 @@ ${content}
sequence: false,
tag: false,
image: true,
+ // fallback
navigation: true
+ // fallback
};
}
_mlyViewer = new mapillary.Viewer(opts);
@@ -37213,8 +41102,7 @@ ${content}
_mlyViewer.setFilter(_mlyViewerFilter);
}
context.ui().photoviewer.on("resize.mapillary", function() {
- if (_mlyViewer)
- _mlyViewer.resize();
+ if (_mlyViewer) _mlyViewer.resize();
});
function imageChanged(node) {
that.resetTags();
@@ -37225,28 +41113,32 @@ ${content}
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`);
+ that.updateDetections(image.id, "".concat(apiUrl, "/").concat(image.id, "/detections?access_token=").concat(accessToken, "&fields=id,image,geometry,value"));
}
- dispatch5.call("imageChanged");
+ dispatch4.call("imageChanged");
}
- function bearingChanged(e) {
- dispatch5.call("bearingChanged", void 0, e);
+ 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(e) {
- console.error("mly3", e);
+ _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(`${apiUrl}/${id2}/detections?access_token=${accessToken}&fields=id,value,image`);
+ 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 = {
@@ -37260,27 +41152,27 @@ ${content}
_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(d) {
- return d.sequence_id === selectedSequenceId || d.id === hoveredImageId;
- }).classed("hovered", function(d) {
- return d.id === hoveredImageId;
+ 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(d) {
- return d.properties.id === hoveredSequenceId;
- }).classed("currentView", function(d) {
- return d.properties.id === selectedSequenceId;
+ 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;
+ if (!_mlyViewer || _mlyFallback) return;
+ if (!imageId) return;
const cache = _mlyCache.image_detections;
if (cache.forImageId[imageId]) {
showDetections(_mlyCache.image_detections.forImageId[imageId]);
@@ -37303,49 +41195,53 @@ ${content}
function showDetections(detections) {
const tagComponent = _mlyViewer.getComponent("tag");
detections.forEach(function(data) {
- const tag = makeTag(data);
- if (tag) {
- tagComponent.add([tag]);
+ const tag2 = makeTag(data);
+ if (tag2) {
+ tagComponent.add([tag2]);
}
});
}
function makeTag(data) {
const valueParts = data.value.split("--");
- if (!valueParts.length)
- return;
- let tag;
- let text2;
+ if (!valueParts.length) return;
+ let tag2;
+ let text;
let color2 = 16777215;
if (_mlyHighlightedDetection === data.id) {
color2 = 16776960;
- text2 = valueParts[1];
- if (text2 === "flat" || text2 === "discrete" || text2 === "sign") {
- text2 = valueParts[2];
+ text = valueParts[1];
+ if (text === "flat" || text === "discrete" || text === "sign") {
+ text = valueParts[2];
}
- text2 = text2.replace(/-/g, " ");
- text2 = text2.charAt(0).toUpperCase() + text2.slice(1);
+ text = text.replace(/-/g, " ");
+ text = text.charAt(0).toUpperCase() + text.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);
+ for (var i3 = 0; i3 < decodedGeometry.length; i3++) {
+ uintArray[i3] = decodedGeometry.charCodeAt(i3);
}
- const tile = new import_vector_tile.VectorTile(new import_pbf.default(uintArray.buffer));
+ 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]));
- tag = new mapillary.OutlineTag(data.id, new mapillary.PolygonGeometry(polygon2[0]), {
- text: text2,
- textColor: color2,
- lineColor: color2,
- lineWidth: 2,
- fillColor: color2,
- fillOpacity: 0.3
- });
- return tag;
+ 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;
}
@@ -37399,7 +41295,7 @@ ${content}
var issue = this;
if (issue.severity === "warning") {
fixes.push(new validationIssueFix({
- title: _t.html("issues.fix.ignore_issue.title"),
+ title: _t.append("issues.fix.ignore_issue.title"),
icon: "iD-icon-close",
onClick: function() {
context.validator().ignoreIssue(this.issue.id);
@@ -37407,7 +41303,7 @@ ${content}
}));
}
fixes.forEach(function(fix) {
- fix.id = fix.title;
+ fix.id = fix.title.stringId;
fix.issue = issue;
if (fix.autoArgs) {
issue.autoFix = fix;
@@ -37431,15 +41327,15 @@ ${content}
return {
equals: function(equals) {
return function(tags) {
- return Object.keys(equals).every(function(k) {
- return equals[k] === tags[k];
+ return Object.keys(equals).every(function(k2) {
+ return equals[k2] === tags[k2];
});
};
},
notEquals: function(notEquals) {
return function(tags) {
- return Object.keys(notEquals).some(function(k) {
- return notEquals[k] !== tags[k];
+ return Object.keys(notEquals).some(function(k2) {
+ return notEquals[k2] !== tags[k2];
});
};
},
@@ -37521,6 +41417,7 @@ ${content}
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) {
@@ -37530,6 +41427,7 @@ ${content}
return rules;
}, []);
},
+ // builds tagMap from mapcss-parse selector object...
buildTagMap: function(selector) {
var getRegexValues = function(regexes) {
return regexes.map(function(regex) {
@@ -37539,10 +41437,10 @@ ${content}
var tagMap = Object.keys(selector).reduce(function(expectedTags, key) {
var values;
var isRegex = /regex/gi.test(key);
- var isEqual = /equals/gi.test(key);
- if (isRegex || isEqual) {
+ var isEqual4 = /equals/gi.test(key);
+ if (isRegex || isEqual4) {
Object.keys(selector[key]).forEach(function(selectorKey) {
- values = isEqual ? [selector[key][selectorKey]] : getRegexValues(selector[key][selectorKey]);
+ values = isEqual4 ? [selector[key][selectorKey]] : getRegexValues(selector[key][selectorKey]);
if (expectedTags.hasOwnProperty(selectorKey)) {
values = values.concat(expectedTags[selectorKey]);
}
@@ -37560,6 +41458,7 @@ ${content}
}, {});
return tagMap;
},
+ // inspired by osmWay#isArea()
inferGeometry: function(tagMap) {
var _lineKeys = this._lineKeys;
var _areaKeys = this._areaKeys;
@@ -37587,14 +41486,18 @@ ${content}
}
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") {
@@ -37603,6 +41506,7 @@ ${content}
return this.inferredGeometry === entity.geometry(graph);
}
},
+ // 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";
@@ -37623,737 +41527,16 @@ ${content}
clearRules: function() {
this._validationRules = [];
},
+ // returns validationRules...
validationRules: function() {
return this._validationRules;
},
+ // returns ruleChecks
ruleChecks: function() {
return this._ruleChecks;
}
};
- // modules/services/nominatim.js
- var import_rbush5 = __toESM(require_rbush_min());
- var apibase = "https://nominatim.openstreetmap.org/";
- var _inflight = {};
- var _nominatimCache;
- var nominatim_default = {
- init: function() {
- _inflight = {};
- _nominatimCache = new import_rbush5.default();
- },
- reset: function() {
- Object.values(_inflight).forEach(function(controller) {
- controller.abort();
- });
- _inflight = {};
- _nominatimCache = new import_rbush5.default();
- },
- countryCode: function(location, callback) {
- this.reverse(location, function(err, result) {
- if (err) {
- return callback(err);
- } else if (result.address) {
- return callback(null, result.address.country_code);
- } else {
- return callback("Unable to geocode", null);
- }
- });
- },
- 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);
- }
- if (callback)
- callback(null, result);
- }).catch(function(err) {
- delete _inflight[url];
- if (err.name === "AbortError")
- return;
- if (callback)
- callback(err.message);
- });
- }
- };
-
- // node_modules/name-suggestion-index/lib/matcher.js
- var import_which_polygon3 = __toESM(require_which_polygon(), 1);
-
- // node_modules/name-suggestion-index/lib/simplify.js
- var import_diacritics2 = __toESM(require_diacritics(), 1);
- function simplify(str2) {
- if (typeof str2 !== "string")
- return "";
- return import_diacritics2.default.remove(str2.replace(/&/g, "and").replace(/Ä°/ig, "i").replace(/[\s\-=_!"#%'*{},.\/:;?\(\)\[\]@\\$\^*+<>«»~`â\u00a1\u00a7\u00b6\u00b7\u00bf\u037e\u0387\u055a-\u055f\u0589\u05c0\u05c3\u05c6\u05f3\u05f4\u0609\u060a\u060c\u060d\u061b\u061e\u061f\u066a-\u066d\u06d4\u0700-\u070d\u07f7-\u07f9\u0830-\u083e\u085e\u0964\u0965\u0970\u0af0\u0df4\u0e4f\u0e5a\u0e5b\u0f04-\u0f12\u0f14\u0f85\u0fd0-\u0fd4\u0fd9\u0fda\u104a-\u104f\u10fb\u1360-\u1368\u166d\u166e\u16eb-\u16ed\u1735\u1736\u17d4-\u17d6\u17d8-\u17da\u1800-\u1805\u1807-\u180a\u1944\u1945\u1a1e\u1a1f\u1aa0-\u1aa6\u1aa8-\u1aad\u1b5a-\u1b60\u1bfc-\u1bff\u1c3b-\u1c3f\u1c7e\u1c7f\u1cc0-\u1cc7\u1cd3\u2000-\u206f\u2cf9-\u2cfc\u2cfe\u2cff\u2d70\u2e00-\u2e7f\u3001-\u3003\u303d\u30fb\ua4fe\ua4ff\ua60d-\ua60f\ua673\ua67e\ua6f2-\ua6f7\ua874-\ua877\ua8ce\ua8cf\ua8f8-\ua8fa\ua92e\ua92f\ua95f\ua9c1-\ua9cd\ua9de\ua9df\uaa5c-\uaa5f\uaade\uaadf\uaaf0\uaaf1\uabeb\ufe10-\ufe16\ufe19\ufe30\ufe45\ufe46\ufe49-\ufe4c\ufe50-\ufe52\ufe54-\ufe57\ufe5f-\ufe61\ufe68\ufe6a\ufe6b\ufeff\uff01-\uff03\uff05-\uff07\uff0a\uff0c\uff0e\uff0f\uff1a\uff1b\uff1f\uff20\uff3c\uff61\uff64\uff65]+/g, "").toLowerCase());
- }
-
- // node_modules/name-suggestion-index/config/matchGroups.json
- var matchGroups = {
- adult_gaming_centre: [
- "amenity/casino",
- "amenity/gambling",
- "leisure/adult_gaming_centre"
- ],
- beauty: [
- "shop/beauty",
- "shop/hairdresser_supply"
- ],
- bed: [
- "shop/bed",
- "shop/furniture"
- ],
- beverages: [
- "shop/alcohol",
- "shop/beer",
- "shop/beverages",
- "shop/wine"
- ],
- camping: [
- "tourism/camp_site",
- "tourism/caravan_site"
- ],
- car_parts: [
- "shop/car_parts",
- "shop/car_repair",
- "shop/tires",
- "shop/tyres"
- ],
- clinic: [
- "amenity/clinic",
- "amenity/doctors",
- "healthcare/clinic",
- "healthcare/laboratory",
- "healthcare/physiotherapist",
- "healthcare/sample_collection",
- "healthcare/dialysis"
- ],
- convenience: [
- "shop/beauty",
- "shop/chemist",
- "shop/convenience",
- "shop/cosmetics",
- "shop/grocery",
- "shop/newsagent",
- "shop/perfumery"
- ],
- coworking: [
- "amenity/coworking_space",
- "office/coworking",
- "office/coworking_space"
- ],
- dentist: [
- "amenity/dentist",
- "amenity/doctors",
- "healthcare/dentist"
- ],
- electronics: [
- "office/telecommunication",
- "shop/computer",
- "shop/electronics",
- "shop/hifi",
- "shop/mobile",
- "shop/mobile_phone",
- "shop/telecommunication"
- ],
- fabric: [
- "shop/fabric",
- "shop/haberdashery",
- "shop/sewing"
- ],
- fashion: [
- "shop/accessories",
- "shop/bag",
- "shop/boutique",
- "shop/clothes",
- "shop/department_store",
- "shop/fashion",
- "shop/fashion_accessories",
- "shop/sports",
- "shop/shoes"
- ],
- financial: [
- "amenity/bank",
- "office/accountant",
- "office/financial",
- "office/financial_advisor",
- "office/tax_advisor",
- "shop/tax"
- ],
- fitness: [
- "leisure/fitness_centre",
- "leisure/fitness_center",
- "leisure/sports_centre",
- "leisure/sports_center"
- ],
- food: [
- "amenity/bar",
- "amenity/cafe",
- "amenity/fast_food",
- "amenity/ice_cream",
- "amenity/pub",
- "amenity/restaurant",
- "shop/bakery",
- "shop/candy",
- "shop/chocolate",
- "shop/coffee",
- "shop/confectionary",
- "shop/confectionery",
- "shop/food",
- "shop/ice_cream",
- "shop/pastry",
- "shop/tea"
- ],
- fuel: [
- "amenity/fuel",
- "shop/gas",
- "shop/convenience;gas",
- "shop/gas;convenience"
- ],
- gift: [
- "shop/gift",
- "shop/card",
- "shop/cards",
- "shop/stationery"
- ],
- hardware: [
- "shop/bathroom_furnishing",
- "shop/carpet",
- "shop/diy",
- "shop/doityourself",
- "shop/doors",
- "shop/electrical",
- "shop/flooring",
- "shop/hardware",
- "shop/hardware_store",
- "shop/power_tools",
- "shop/tool_hire",
- "shop/tools",
- "shop/trade"
- ],
- health_food: [
- "shop/health",
- "shop/health_food",
- "shop/herbalist",
- "shop/nutrition_supplements"
- ],
- hobby: [
- "shop/electronics",
- "shop/hobby",
- "shop/books",
- "shop/games",
- "shop/collector",
- "shop/toys",
- "shop/model",
- "shop/video_games",
- "shop/anime"
- ],
- hospital: [
- "amenity/doctors",
- "amenity/hospital",
- "healthcare/hospital"
- ],
- houseware: [
- "shop/houseware",
- "shop/interior_decoration"
- ],
- lifeboat_station: [
- "amenity/lifeboat_station",
- "emergency/lifeboat_station",
- "emergency/marine_rescue"
- ],
- lodging: [
- "tourism/hotel",
- "tourism/motel"
- ],
- money_transfer: [
- "amenity/money_transfer",
- "shop/money_transfer"
- ],
- office_supplies: [
- "shop/office_supplies",
- "shop/stationary",
- "shop/stationery"
- ],
- outdoor: [
- "shop/clothes",
- "shop/outdoor",
- "shop/sports"
- ],
- parcel_locker: [
- "amenity/parcel_locker",
- "amenity/vending_machine"
- ],
- pharmacy: [
- "amenity/doctors",
- "amenity/pharmacy",
- "healthcare/pharmacy"
- ],
- playground: [
- "amenity/theme_park",
- "leisure/amusement_arcade",
- "leisure/playground"
- ],
- rental: [
- "amenity/bicycle_rental",
- "amenity/boat_rental",
- "amenity/car_rental",
- "amenity/truck_rental",
- "amenity/vehicle_rental",
- "shop/rental"
- ],
- school: [
- "amenity/childcare",
- "amenity/college",
- "amenity/kindergarten",
- "amenity/language_school",
- "amenity/prep_school",
- "amenity/school",
- "amenity/university"
- ],
- storage: [
- "shop/storage_units",
- "shop/storage_rental"
- ],
- substation: [
- "power/station",
- "power/substation",
- "power/sub_station"
- ],
- supermarket: [
- "shop/food",
- "shop/frozen_food",
- "shop/greengrocer",
- "shop/grocery",
- "shop/supermarket",
- "shop/wholesale"
- ],
- variety_store: [
- "shop/variety_store",
- "shop/discount",
- "shop/convenience"
- ],
- vending: [
- "amenity/vending_machine",
- "shop/vending_machine"
- ],
- weight_loss: [
- "amenity/clinic",
- "amenity/doctors",
- "amenity/weight_clinic",
- "healthcare/counselling",
- "leisure/fitness_centre",
- "office/therapist",
- "shop/beauty",
- "shop/diet",
- "shop/food",
- "shop/health_food",
- "shop/herbalist",
- "shop/nutrition",
- "shop/nutrition_supplements",
- "shop/weight_loss"
- ],
- wholesale: [
- "shop/wholesale",
- "shop/supermarket",
- "shop/department_store"
- ]
- };
- var matchGroups_default = {
- matchGroups
- };
-
- // node_modules/name-suggestion-index/config/genericWords.json
- var genericWords = [
- "^(barn|bazaa?r|bench|bou?tique|building|casa|church)$",
- "^(baseball|basketball|football|soccer|softball|tennis(halle)?)\\s?(field|court)?$",
- "^(club|green|out|ware)\\s?house$",
- "^(driveway|el \xE1rbol|fountain|generic|golf|government|graveyard)$",
- "^(fixme|n\\s?\\/?\\s?a|name|no\\s?name|none|null|temporary|test|unknown)$",
- "^(hofladen|librairie|magazine?|maison)$",
- "^(mobile home|skate)?\\s?park$",
- "^(obuwie|pond|pool|sale|shops?|sklep|stores?)$",
- "^\\?+$",
- "^private$",
- "^tattoo( studio)?$",
- "^windmill$",
- "^\u0446\u0435\u0440\u043A\u043E\u0432\u043D\u0430\u044F( \u043B\u0430\u0432\u043A\u0430)?$"
- ];
- var genericWords_default = {
- genericWords
- };
-
- // node_modules/name-suggestion-index/config/trees.json
- var trees = {
- brands: {
- emoji: "\u{1F354}",
- mainTag: "brand:wikidata",
- sourceTags: ["brand", "name"],
- nameTags: {
- primary: "^(name|name:\\w+)$",
- alternate: "^(brand|brand:\\w+|operator|operator:\\w+|\\w+_name|\\w+_name:\\w+)$"
- }
- },
- flags: {
- emoji: "\u{1F6A9}",
- mainTag: "flag:wikidata",
- nameTags: {
- primary: "^(flag:name|flag:name:\\w+)$",
- alternate: "^(country|country:\\w+|flag|flag:\\w+|subject|subject:\\w+)$"
- }
- },
- operators: {
- emoji: "\u{1F4BC}",
- mainTag: "operator:wikidata",
- sourceTags: ["operator"],
- nameTags: {
- primary: "^(name|name:\\w+|operator|operator:\\w+)$",
- alternate: "^(brand|brand:\\w+|\\w+_name|\\w+_name:\\w+)$"
- }
- },
- transit: {
- emoji: "\u{1F687}",
- mainTag: "network:wikidata",
- sourceTags: ["network"],
- nameTags: {
- primary: "^network$",
- alternate: "^(operator|operator:\\w+|network:\\w+|\\w+_name|\\w+_name:\\w+)$"
- }
- }
- };
- var trees_default = {
- trees
- };
-
- // node_modules/name-suggestion-index/lib/matcher.js
- var matchGroups2 = matchGroups_default.matchGroups;
- var trees2 = trees_default.trees;
- var Matcher = class {
- constructor() {
- this.matchIndex = void 0;
- this.genericWords = /* @__PURE__ */ new Map();
- (genericWords_default.genericWords || []).forEach((s) => this.genericWords.set(s, new RegExp(s, "i")));
- this.itemLocation = void 0;
- this.locationSets = void 0;
- this.locationIndex = void 0;
- this.warnings = [];
- }
- buildMatchIndex(data) {
- const that = this;
- if (that.matchIndex)
- return;
- that.matchIndex = /* @__PURE__ */ new Map();
- const seenTree = /* @__PURE__ */ new Map();
- Object.keys(data).forEach((tkv) => {
- const category = data[tkv];
- const parts = tkv.split("/", 3);
- const t = parts[0];
- const k = parts[1];
- const v = parts[2];
- const thiskv = `${k}/${v}`;
- const tree = trees2[t];
- let branch = that.matchIndex.get(thiskv);
- if (!branch) {
- branch = {
- primary: /* @__PURE__ */ new Map(),
- alternate: /* @__PURE__ */ new Map(),
- excludeGeneric: /* @__PURE__ */ new Map(),
- excludeNamed: /* @__PURE__ */ new Map()
- };
- that.matchIndex.set(thiskv, branch);
- }
- const properties = category.properties || {};
- const exclude = properties.exclude || {};
- (exclude.generic || []).forEach((s) => branch.excludeGeneric.set(s, new RegExp(s, "i")));
- (exclude.named || []).forEach((s) => branch.excludeNamed.set(s, new RegExp(s, "i")));
- const excludeRegexes = [...branch.excludeGeneric.values(), ...branch.excludeNamed.values()];
- let items = category.items;
- if (!Array.isArray(items) || !items.length)
- return;
- const primaryName = new RegExp(tree.nameTags.primary, "i");
- const alternateName = new RegExp(tree.nameTags.alternate, "i");
- const notName = /:(colou?r|type|forward|backward|left|right|etymology|pronunciation|wikipedia)$/i;
- const skipGenericKV = skipGenericKVMatches(t, k, v);
- const genericKV = /* @__PURE__ */ new Set([`${k}/yes`, `building/yes`]);
- const matchGroupKV = /* @__PURE__ */ new Set();
- Object.values(matchGroups2).forEach((matchGroup) => {
- const inGroup = matchGroup.some((otherkv) => otherkv === thiskv);
- if (!inGroup)
- return;
- matchGroup.forEach((otherkv) => {
- if (otherkv === thiskv)
- return;
- matchGroupKV.add(otherkv);
- const otherk = otherkv.split("/", 2)[0];
- genericKV.add(`${otherk}/yes`);
- });
- });
- items.forEach((item) => {
- if (!item.id)
- return;
- if (Array.isArray(item.matchTags) && item.matchTags.length) {
- item.matchTags = item.matchTags.filter((matchTag) => !matchGroupKV.has(matchTag) && !genericKV.has(matchTag));
- if (!item.matchTags.length)
- delete item.matchTags;
- }
- let kvTags = [`${thiskv}`].concat(item.matchTags || []);
- if (!skipGenericKV) {
- kvTags = kvTags.concat(Array.from(genericKV));
- }
- Object.keys(item.tags).forEach((osmkey) => {
- if (notName.test(osmkey))
- return;
- const osmvalue = item.tags[osmkey];
- if (!osmvalue || excludeRegexes.some((regex) => regex.test(osmvalue)))
- return;
- if (primaryName.test(osmkey)) {
- kvTags.forEach((kv) => insertName("primary", t, kv, simplify(osmvalue), item.id));
- } else if (alternateName.test(osmkey)) {
- kvTags.forEach((kv) => insertName("alternate", t, kv, simplify(osmvalue), item.id));
- }
- });
- let keepMatchNames = /* @__PURE__ */ new Set();
- (item.matchNames || []).forEach((matchName) => {
- const nsimple = simplify(matchName);
- kvTags.forEach((kv) => {
- const branch2 = that.matchIndex.get(kv);
- const primaryLeaf = branch2 && branch2.primary.get(nsimple);
- const alternateLeaf = branch2 && branch2.alternate.get(nsimple);
- const inPrimary = primaryLeaf && primaryLeaf.has(item.id);
- const inAlternate = alternateLeaf && alternateLeaf.has(item.id);
- if (!inPrimary && !inAlternate) {
- insertName("alternate", t, kv, nsimple, item.id);
- keepMatchNames.add(matchName);
- }
- });
- });
- if (keepMatchNames.size) {
- item.matchNames = Array.from(keepMatchNames);
- } else {
- delete item.matchNames;
- }
- });
- });
- function insertName(which, t, kv, nsimple, itemID) {
- if (!nsimple) {
- that.warnings.push(`Warning: skipping empty ${which} name for item ${t}/${kv}: ${itemID}`);
- return;
- }
- let branch = that.matchIndex.get(kv);
- if (!branch) {
- branch = {
- primary: /* @__PURE__ */ new Map(),
- alternate: /* @__PURE__ */ new Map(),
- excludeGeneric: /* @__PURE__ */ new Map(),
- excludeNamed: /* @__PURE__ */ new Map()
- };
- that.matchIndex.set(kv, branch);
- }
- let leaf = branch[which].get(nsimple);
- if (!leaf) {
- leaf = /* @__PURE__ */ new Set();
- branch[which].set(nsimple, leaf);
- }
- leaf.add(itemID);
- if (!/yes$/.test(kv)) {
- const kvnsimple = `${kv}/${nsimple}`;
- const existing = seenTree.get(kvnsimple);
- if (existing && existing !== t) {
- const items = Array.from(leaf);
- that.warnings.push(`Duplicate cache key "${kvnsimple}" in trees "${t}" and "${existing}", check items: ${items}`);
- return;
- }
- seenTree.set(kvnsimple, t);
- }
- }
- function skipGenericKVMatches(t, k, v) {
- return t === "flags" || t === "transit" || k === "landuse" || v === "atm" || v === "bicycle_parking" || v === "car_sharing" || v === "caravan_site" || v === "charging_station" || v === "dog_park" || v === "parking" || v === "phone" || v === "playground" || v === "post_box" || v === "public_bookcase" || v === "recycling" || v === "vending_machine";
- }
- }
- buildLocationIndex(data, loco) {
- const that = this;
- if (that.locationIndex)
- return;
- that.itemLocation = /* @__PURE__ */ new Map();
- that.locationSets = /* @__PURE__ */ new Map();
- Object.keys(data).forEach((tkv) => {
- const items = data[tkv].items;
- if (!Array.isArray(items) || !items.length)
- return;
- items.forEach((item) => {
- if (that.itemLocation.has(item.id))
- return;
- let resolved;
- try {
- resolved = loco.resolveLocationSet(item.locationSet);
- } catch (err) {
- console.warn(`buildLocationIndex: ${err.message}`);
- }
- if (!resolved || !resolved.id)
- return;
- that.itemLocation.set(item.id, resolved.id);
- if (that.locationSets.has(resolved.id))
- return;
- let feature3 = _cloneDeep2(resolved.feature);
- feature3.id = resolved.id;
- feature3.properties.id = resolved.id;
- if (!feature3.geometry.coordinates.length || !feature3.properties.area) {
- console.warn(`buildLocationIndex: locationSet ${resolved.id} for ${item.id} resolves to an empty feature:`);
- console.warn(JSON.stringify(feature3));
- return;
- }
- that.locationSets.set(resolved.id, feature3);
- });
- });
- that.locationIndex = (0, import_which_polygon3.default)({ type: "FeatureCollection", features: [...that.locationSets.values()] });
- function _cloneDeep2(obj) {
- return JSON.parse(JSON.stringify(obj));
- }
- }
- match(k, v, n2, loc) {
- const that = this;
- if (!that.matchIndex) {
- throw new Error("match: matchIndex not built.");
- }
- let matchLocations;
- if (Array.isArray(loc) && that.locationIndex) {
- matchLocations = that.locationIndex([loc[0], loc[1], loc[0], loc[1]], true);
- }
- const nsimple = simplify(n2);
- let seen = /* @__PURE__ */ new Set();
- let results = [];
- gatherResults("primary");
- gatherResults("alternate");
- if (results.length)
- return results;
- gatherResults("exclude");
- return results.length ? results : null;
- function gatherResults(which) {
- const kv = `${k}/${v}`;
- let didMatch = tryMatch(which, kv);
- if (didMatch)
- return;
- for (let mg in matchGroups2) {
- const matchGroup = matchGroups2[mg];
- const inGroup = matchGroup.some((otherkv) => otherkv === kv);
- if (!inGroup)
- continue;
- for (let i2 = 0; i2 < matchGroup.length; i2++) {
- const otherkv = matchGroup[i2];
- if (otherkv === kv)
- continue;
- didMatch = tryMatch(which, otherkv);
- if (didMatch)
- return;
- }
- }
- if (which === "exclude") {
- const regex = [...that.genericWords.values()].find((regex2) => regex2.test(n2));
- if (regex) {
- results.push({ match: "excludeGeneric", pattern: String(regex) });
- return;
- }
- }
- }
- function tryMatch(which, kv) {
- const branch = that.matchIndex.get(kv);
- if (!branch)
- return;
- if (which === "exclude") {
- let regex = [...branch.excludeNamed.values()].find((regex2) => regex2.test(n2));
- if (regex) {
- results.push({ match: "excludeNamed", pattern: String(regex), kv });
- return;
- }
- regex = [...branch.excludeGeneric.values()].find((regex2) => regex2.test(n2));
- if (regex) {
- results.push({ match: "excludeGeneric", pattern: String(regex), kv });
- return;
- }
- return;
- }
- const leaf = branch[which].get(nsimple);
- if (!leaf || !leaf.size)
- return;
- let hits = Array.from(leaf).map((itemID) => {
- let area = Infinity;
- if (that.itemLocation && that.locationSets) {
- const location = that.locationSets.get(that.itemLocation.get(itemID));
- area = location && location.properties.area || Infinity;
- }
- return { match: which, itemID, area, kv, nsimple };
- });
- let sortFn = byAreaDescending;
- if (matchLocations) {
- hits = hits.filter(isValidLocation);
- sortFn = byAreaAscending;
- }
- if (!hits.length)
- return;
- hits.sort(sortFn).forEach((hit) => {
- if (seen.has(hit.itemID))
- return;
- seen.add(hit.itemID);
- results.push(hit);
- });
- return true;
- function isValidLocation(hit) {
- if (!that.itemLocation)
- return true;
- return matchLocations.find((props) => props.id === that.itemLocation.get(hit.itemID));
- }
- function byAreaAscending(hitA, hitB) {
- return hitA.area - hitB.area;
- }
- function byAreaDescending(hitA, hitB) {
- return hitB.area - hitA.area;
- }
- }
- }
- getWarnings() {
- return this.warnings;
- }
- };
-
- // modules/services/nsi.js
- var import_vparse2 = __toESM(require_vparse());
-
// modules/core/difference.js
var import_fast_deep_equal3 = __toESM(require_fast_deep_equal());
function coreDifference(base, head) {
@@ -38361,51 +41544,49 @@ ${content}
var _didChange = {};
var _diff = {};
function checkEntityID(id2) {
- var h = head.entities[id2];
- var b = base.entities[id2];
- if (h === b)
- return;
- if (_changes[id2])
- return;
- if (!h && b) {
- _changes[id2] = { base: b, head: h };
+ 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 (h && !b) {
- _changes[id2] = { base: b, head: h };
+ if (h2 && !b2) {
+ _changes[id2] = { base: b2, head: h2 };
_didChange.addition = true;
return;
}
- if (h && b) {
- if (h.members && b.members && !(0, import_fast_deep_equal3.default)(h.members, b.members)) {
- _changes[id2] = { base: b, head: h };
+ 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;
}
- if (h.loc && b.loc && !geoVecEqual(h.loc, b.loc)) {
- _changes[id2] = { base: b, head: h };
+ if (h2.loc && b2.loc && !geoVecEqual(h2.loc, b2.loc)) {
+ _changes[id2] = { base: b2, head: h2 };
_didChange.geometry = true;
}
- if (h.nodes && b.nodes && !(0, import_fast_deep_equal3.default)(h.nodes, b.nodes)) {
- _changes[id2] = { base: b, head: h };
+ 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 (h.tags && b.tags && !(0, import_fast_deep_equal3.default)(h.tags, b.tags)) {
- _changes[id2] = { base: b, head: h };
+ 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 i2 = 0; i2 < ids.length; i2++) {
- checkEntityID(ids[i2]);
+ for (var i3 = 0; i3 < ids.length; i3++) {
+ checkEntityID(ids[i3]);
}
}
load();
- _diff.length = function length() {
+ _diff.length = function length2() {
return Object.keys(_changes).length;
};
_diff.changes = function changes() {
@@ -38418,15 +41599,15 @@ ${content}
if (_changes[id2].head) {
result.add(id2);
}
- var h = _changes[id2].head;
- var b = _changes[id2].base;
- var entity = h || b;
+ var h2 = _changes[id2].head;
+ var b2 = _changes[id2].base;
+ var entity = h2 || b2;
if (includeRelMembers && entity.type === "relation") {
- var mh = h ? h.members.map(function(m) {
- return m.id;
+ var mh = h2 ? h2.members.map(function(m2) {
+ return m2.id;
}) : [];
- var mb = b ? b.members.map(function(m) {
- return m.id;
+ var mb = b2 ? b2.members.map(function(m2) {
+ return m2.id;
}) : [];
utilArrayUnion(mh, mb).forEach(function(memberID) {
if (head.hasEntity(memberID)) {
@@ -38466,9 +41647,9 @@ ${content}
};
_diff.summary = function summary() {
var relevant = {};
- var keys = Object.keys(_changes);
- for (var i2 = 0; i2 < keys.length; i2++) {
- var change = _changes[keys[i2]];
+ 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") {
@@ -38511,42 +41692,40 @@ ${content}
var id2, change;
for (id2 in _changes) {
change = _changes[id2];
- var h = change.head;
- var b = change.base;
- var entity = h || b;
- var i2;
- if (extent && (!h || !h.intersects(extent, head)) && (!b || !b.intersects(extent, base))) {
+ 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;
}
- result[id2] = h;
+ result[id2] = h2;
if (entity.type === "way") {
- var nh = h ? h.nodes : [];
- var nb = b ? b.nodes : [];
+ var nh = h2 ? h2.nodes : [];
+ var nb = b2 ? b2.nodes : [];
var diff;
diff = utilArrayDifference(nh, nb);
- for (i2 = 0; i2 < diff.length; i2++) {
- result[diff[i2]] = head.hasEntity(diff[i2]);
+ for (i3 = 0; i3 < diff.length; i3++) {
+ result[diff[i3]] = head.hasEntity(diff[i3]);
}
diff = utilArrayDifference(nb, nh);
- for (i2 = 0; i2 < diff.length; i2++) {
- result[diff[i2]] = head.hasEntity(diff[i2]);
+ for (i3 = 0; i3 < diff.length; i3++) {
+ result[diff[i3]] = head.hasEntity(diff[i3]);
}
}
if (entity.type === "relation" && entity.isMultipolygon()) {
- var mh = h ? h.members.map(function(m) {
- return m.id;
+ var mh = h2 ? h2.members.map(function(m2) {
+ return m2.id;
}) : [];
- var mb = b ? b.members.map(function(m) {
- return m.id;
+ var mb = b2 ? b2.members.map(function(m2) {
+ return m2.id;
}) : [];
var ids = utilArrayUnion(mh, mb);
- for (i2 = 0; i2 < ids.length; i2++) {
- var member = head.hasEntity(ids[i2]);
- if (!member)
- continue;
- if (extent && !member.intersects(extent, head))
- continue;
- result[ids[i2]] = member;
+ 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;
}
}
addParents(head.parentWays(entity), result);
@@ -38554,10 +41733,9 @@ ${content}
}
return result;
function addParents(parents, result2) {
- for (var i3 = 0; i3 < parents.length; i3++) {
- var parent = parents[i3];
- if (parent.id in result2)
- continue;
+ 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);
}
@@ -38567,28 +41745,26 @@ ${content}
}
// modules/core/tree.js
- var import_rbush6 = __toESM(require_rbush_min());
function coreTree(head) {
- var _rtree = new import_rbush6.default();
+ var _rtree = new RBush();
var _bboxes = {};
- var _segmentsRTree = new import_rbush6.default();
+ var _segmentsRTree = new RBush();
var _segmentsBBoxes = {};
var _segmentsByWayId = {};
var tree = {};
function entityBBox(entity) {
- var bbox = entity.extent(head).bbox();
- bbox.id = entity.id;
- _bboxes[entity.id] = bbox;
- return bbox;
+ 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 bbox = extent.bbox();
- bbox.segment = segment;
- _segmentsBBoxes[segment.id] = bbox;
- return bbox;
+ if (!extent) return null;
+ var bbox2 = extent.bbox();
+ bbox2.segment = segment;
+ _segmentsBBoxes[segment.id] = bbox2;
+ return bbox2;
}
function removeEntity(entity) {
_rtree.remove(_bboxes[entity.id]);
@@ -38611,8 +41787,7 @@ ${content}
segments = segments.concat(entitySegments);
}
});
- if (segments.length)
- _segmentsRTree.load(segments.map(segmentBBox).filter(Boolean));
+ if (segments.length) _segmentsRTree.load(segments.map(segmentBBox).filter(Boolean));
}
function updateParents(entity, insertions, memo) {
head.parentWays(entity).forEach(function(way) {
@@ -38623,9 +41798,8 @@ ${content}
updateParents(way, insertions, memo);
});
head.parentRelations(entity).forEach(function(relation) {
- if (memo[entity.id])
- return;
- memo[entity.id] = true;
+ if (memo[relation.id]) return;
+ memo[relation.id] = true;
if (_bboxes[relation.id]) {
removeEntity(relation);
insertions[relation.id] = relation;
@@ -38635,10 +41809,9 @@ ${content}
}
tree.rebase = function(entities, force) {
var insertions = {};
- for (var i2 = 0; i2 < entities.length; i2++) {
- var entity = entities[i2];
- if (!entity.visible)
- continue;
+ 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;
@@ -38653,13 +41826,11 @@ ${content}
return tree;
};
function updateToGraph(graph) {
- if (graph === head)
- return;
+ if (graph === head) return;
var diff = coreDifference(head, graph);
head = graph;
var changed = diff.didChange;
- if (!changed.addition && !changed.deletion && !changed.geometry)
- return;
+ if (!changed.addition && !changed.deletion && !changed.geometry) return;
var insertions = {};
if (changed.deletion) {
diff.deleted().forEach(function(entity) {
@@ -38682,23 +41853,23 @@ ${content}
}
tree.intersects = function(extent, graph) {
updateToGraph(graph);
- return _rtree.search(extent.bbox()).map(function(bbox) {
- return graph.entity(bbox.id);
+ 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(bbox) {
- return bbox.segment;
+ return _segmentsRTree.search(extent.bbox()).map(function(bbox2) {
+ return bbox2.segment;
});
};
return tree;
}
// modules/svg/icon.js
- function svgIcon(name2, svgklass, useklass) {
+ 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", name2).attr("class", useklass);
+ 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);
};
}
@@ -38766,14 +41937,12 @@ ${content}
return loading;
};
loading.message = function(val) {
- if (!arguments.length)
- return _message;
+ if (!arguments.length) return _message;
_message = val;
return loading;
};
loading.blocking = function(val) {
- if (!arguments.length)
- return _blocking;
+ if (!arguments.length) return _blocking;
_blocking = val;
return loading;
};
@@ -38788,7 +41957,7 @@ ${content}
// modules/core/history.js
function coreHistory(context) {
- var dispatch10 = dispatch_default("reset", "change", "merge", "restore", "undone", "redone", "storage_error");
+ 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;
@@ -38799,15 +41968,15 @@ ${content}
var _stack;
var _index;
var _tree;
- function _act(actions, t) {
+ function _act(actions, t2) {
actions = Array.prototype.slice.call(actions);
var annotation;
if (typeof actions[actions.length - 1] !== "function") {
annotation = actions.pop();
}
var graph = _stack[_index].graph;
- for (var i2 = 0; i2 < actions.length; i2++) {
- graph = actions[i2](graph, t);
+ for (var i3 = 0; i3 < actions.length; i3++) {
+ graph = actions[i3](graph, t2);
}
return {
graph,
@@ -38818,41 +41987,41 @@ ${content}
selectedIDs: context.selectedIDs()
};
}
- function _perform(args, t) {
+ function _perform(args, t2) {
var previous = _stack[_index].graph;
_stack = _stack.slice(0, _index + 1);
- var actionResult = _act(args, t);
+ var actionResult = _act(args, t2);
_stack.push(actionResult);
_index++;
return change(previous);
}
- function _replace(args, t) {
+ function _replace(args, t2) {
var previous = _stack[_index].graph;
- var actionResult = _act(args, t);
+ var actionResult = _act(args, t2);
_stack[_index] = actionResult;
return change(previous);
}
- function _overwrite(args, t) {
+ function _overwrite(args, t2) {
var previous = _stack[_index].graph;
if (_index > 0) {
_index--;
_stack.pop();
}
_stack = _stack.slice(0, _index + 1);
- var actionResult = _act(args, t);
+ var actionResult = _act(args, t2);
_stack.push(actionResult);
_index++;
return change(previous);
}
function change(previous) {
- var difference = coreDifference(previous, history.graph());
+ var difference2 = coreDifference(previous, history.graph());
if (!_pausedGraph) {
- dispatch10.call("change", this, difference);
+ dispatch14.call("change", this, difference2);
}
- return difference;
+ return difference2;
}
- function getKey(n2) {
- return "iD_" + window.location.origin + "_" + n2;
+ function getKey(n3) {
+ return "iD_" + window.location.origin + "_" + n3;
}
var history = {
graph: function() {
@@ -38870,7 +42039,7 @@ ${content}
});
_stack[0].graph.rebase(entities, stack, false);
_tree.rebase(entities, false);
- dispatch10.call("merge", this, entities);
+ dispatch14.call("merge", this, entities);
},
perform: function() {
select_default2(document).interrupt("history.perform");
@@ -38882,9 +42051,8 @@ ${content}
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);
+ return function(t2) {
+ if (t2 < 1) _overwrite([action0], t2);
};
}).on("start", function() {
_perform([action0], 0);
@@ -38899,34 +42067,36 @@ ${content}
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(n2) {
+ pop: function(n3) {
select_default2(document).interrupt("history.perform");
var previous = _stack[_index].graph;
- if (isNaN(+n2) || +n2 < 0) {
- n2 = 1;
+ if (isNaN(+n3) || +n3 < 0) {
+ n3 = 1;
}
- while (n2-- > 0 && _index > 0) {
+ 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;
+ if (_stack[_index].annotation) break;
}
- dispatch10.call("undone", this, _stack[_index], previousStack);
+ 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];
@@ -38936,7 +42106,7 @@ ${content}
tryIndex++;
if (_stack[tryIndex].annotation) {
_index = tryIndex;
- dispatch10.call("redone", this, _stack[_index], previousStack);
+ dispatch14.call("redone", this, _stack[_index], previousStack);
break;
}
}
@@ -38955,21 +42125,21 @@ ${content}
}
},
undoAnnotation: function() {
- var i2 = _index;
- while (i2 >= 0) {
- if (_stack[i2].annotation)
- return _stack[i2].annotation;
- i2--;
+ var i3 = _index;
+ while (i3 >= 0) {
+ if (_stack[i3].annotation) return _stack[i3].annotation;
+ i3--;
}
},
redoAnnotation: function() {
- var i2 = _index + 1;
- while (i2 <= _stack.length - 1) {
- if (_stack[i2].annotation)
- return _stack[i2].annotation;
- i2++;
+ 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);
},
@@ -38984,11 +42154,11 @@ ${content}
if (action) {
head = action(head);
}
- var difference = coreDifference(base, head);
+ var difference2 = coreDifference(base, head);
return {
- modified: difference.modified(),
- created: difference.created(),
- deleted: difference.deleted()
+ modified: difference2.modified(),
+ created: difference2.created(),
+ deleted: difference2.deleted()
};
},
hasChanges: function() {
@@ -38999,15 +42169,15 @@ ${content}
_imageryUsed = sources;
return history;
} else {
- var s = /* @__PURE__ */ new Set();
+ var s2 = /* @__PURE__ */ new Set();
_stack.slice(1, _index + 1).forEach(function(state) {
state.imageryUsed.forEach(function(source) {
if (source !== "Custom") {
- s.add(source);
+ s2.add(source);
}
});
});
- return Array.from(s);
+ return Array.from(s2);
}
},
photoOverlaysUsed: function(sources) {
@@ -39015,17 +42185,18 @@ ${content}
_photoOverlaysUsed = sources;
return history;
} else {
- var s = /* @__PURE__ */ new Set();
+ 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) {
- s.add(photoOverlay);
+ s2.add(photoOverlay);
});
}
});
- return Array.from(s);
+ return Array.from(s2);
}
},
+ // save the current history state
checkpoint: function(key) {
_checkpoints[key] = {
stack: _stack,
@@ -39033,6 +42204,7 @@ ${content}
};
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;
@@ -39043,10 +42215,20 @@ ${content}
_tree = coreTree(_stack[0].graph);
_checkpoints = {};
}
- dispatch10.call("reset");
- dispatch10.call("change");
+ 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 = {};
@@ -39101,16 +42283,15 @@ ${content}
}
},
toJSON: function() {
- if (!this.hasChanges())
- return;
+ if (!this.hasChanges()) return;
var allEntities = {};
var baseEntities = {};
var base = _stack[0];
- var s = _stack.map(function(i2) {
+ var s2 = _stack.map(function(i3) {
var modified = [];
var deleted = [];
- Object.keys(i2.graph.entities).forEach(function(id2) {
- var entity = i2.graph.entities[id2];
+ Object.keys(i3.graph.entities).forEach(function(id2) {
+ var entity = i3.graph.entities[id2];
if (entity) {
var key = osmEntity.key(entity);
allEntities[key] = entity;
@@ -39137,46 +42318,40 @@ ${content}
});
}
});
- 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;
+ 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: s,
+ stack: s2,
nextIDs: osmEntity.id.next,
index: _index,
- timestamp: new Date().getTime()
+ // note the time the changes were saved
+ timestamp: (/* @__PURE__ */ new Date()).getTime()
});
},
fromJSON: function(json, loadChildNodes) {
- var h = JSON.parse(json);
+ var h2 = JSON.parse(json);
var loadComplete = true;
- osmEntity.id.next = h.nextIDs;
- _index = h.index;
- if (h.version === 2 || h.version === 3) {
+ osmEntity.id.next = h2.nextIDs;
+ _index = h2.index;
+ if (h2.version === 2 || h2.version === 3) {
var allEntities = {};
- h.entities.forEach(function(entity) {
+ h2.entities.forEach(function(entity) {
allEntities[osmEntity.key(entity)] = osmEntity(entity);
});
- if (h.version === 3) {
- var baseEntities = h.baseEntities.map(function(d) {
- return osmEntity(d);
+ if (h2.version === 3) {
+ var baseEntities = h2.baseEntities.map(function(d2) {
+ return osmEntity(d2);
});
var stack = _stack.map(function(state) {
return state.graph;
@@ -39185,14 +42360,14 @@ ${content}
_tree.rebase(baseEntities, true);
if (loadChildNodes) {
var osm = context.connection();
- var baseWays = baseEntities.filter(function(e) {
- return e.type === "way";
+ 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(n2) {
- return !_stack[0].graph.hasEntity(n2);
+ var missing = nodeIDs.filter(function(n3) {
+ return !_stack[0].graph.hasEntity(n3);
});
if (missing.length && osm) {
loadComplete = false;
@@ -39222,45 +42397,45 @@ ${content}
if (err || !missing.length) {
loading.close();
context.map().redrawEnable(true);
- dispatch10.call("change");
- dispatch10.call("restore", this);
+ dispatch14.call("change");
+ dispatch14.call("restore", this);
}
};
osm.loadMultiple(missing, childNodesLoaded);
}
}
}
- _stack = h.stack.map(function(d) {
+ _stack = h2.stack.map(function(d2) {
var entities = {}, entity;
- if (d.modified) {
- d.modified.forEach(function(key) {
+ if (d2.modified) {
+ d2.modified.forEach(function(key) {
entity = allEntities[key];
entities[entity.id] = entity;
});
}
- if (d.deleted) {
- d.deleted.forEach(function(id2) {
+ if (d2.deleted) {
+ d2.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
+ annotation: d2.annotation,
+ imageryUsed: d2.imageryUsed,
+ photoOverlaysUsed: d2.photoOverlaysUsed,
+ transform: d2.transform,
+ selectedIDs: d2.selectedIDs
};
});
} else {
- _stack = h.stack.map(function(d) {
+ _stack = h2.stack.map(function(d2) {
var entities = {};
- for (var i2 in d.entities) {
- var entity = d.entities[i2];
- entities[i2] = entity === "undefined" ? void 0 : osmEntity(entity);
+ for (var i3 in d2.entities) {
+ var entity = d2.entities[i3];
+ entities[i3] = entity === "undefined" ? void 0 : osmEntity(entity);
}
- d.graph = coreGraph(_stack[0].graph).load(entities);
- return d;
+ d2.graph = coreGraph(_stack[0].graph).load(entities);
+ return d2;
});
}
var transform2 = _stack[_index].transform;
@@ -39268,8 +42443,8 @@ ${content}
context.map().transformEase(transform2, 0);
}
if (loadComplete) {
- dispatch10.call("change");
- dispatch10.call("restore", this);
+ dispatch14.call("change");
+ dispatch14.call("restore", this);
}
return history;
},
@@ -39280,13 +42455,14 @@ ${content}
lock.unlock();
},
save: function() {
- if (lock.locked() && !_hasUnresolvedRestorableChanges) {
+ if (lock.locked() && // don't overwrite existing, unresolved changes
+ !_hasUnresolvedRestorableChanges) {
const success = corePreferences(getKey("saved_history"), history.toJSON() || null);
- if (!success)
- dispatch10.call("storage_error");
+ if (!success) dispatch14.call("storage_error");
}
return history;
},
+ // delete the history version saved in localStorage
clearSaved: function() {
context.debouncedSave.cancel();
if (lock.locked()) {
@@ -39304,18 +42480,18 @@ ${content}
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);
+ if (json) history.fromJSON(json, true);
}
},
_getKey: getKey
};
history.reset();
- return utilRebind(history, dispatch10, "on");
+ return utilRebind(history, dispatch14, "on");
}
// modules/validations/index.js
@@ -39333,15 +42509,30 @@ ${content}
validationMismatchedGeometry: () => validationMismatchedGeometry,
validationMissingRole: () => validationMissingRole,
validationMissingTag: () => validationMissingTag,
+ validationMutuallyExclusiveTags: () => validationMutuallyExclusiveTags,
validationOutdatedTags: () => validationOutdatedTags,
validationPrivateData: () => validationPrivateData,
validationSuspiciousName: () => validationSuspiciousName,
validationUnsquareWay: () => validationUnsquareWay
});
+ // modules/util/utilDisplayLabel.js
+ function utilDisplayLabel(entity, graphOrGeometry, verbose) {
+ var result;
+ var displayName = utilDisplayName(entity);
+ var preset = typeof graphOrGeometry === "string" ? _mainPresetIndex.matchTags(entity.tags, graphOrGeometry) : _mainPresetIndex.match(entity, graphOrGeometry);
+ var presetName = preset && (preset.suggestion ? preset.subtitle() : preset.name());
+ if (verbose) {
+ result = [presetName, displayName].filter(Boolean).join(" ");
+ } else {
+ result = displayName || presetName;
+ }
+ return result || utilDisplayType(entity.id);
+ }
+
// modules/validations/almost_junction.js
function validationAlmostJunction(context) {
- const type3 = "almost_junction";
+ 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;
@@ -39353,27 +42544,25 @@ ${content}
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 [];
+ 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,
+ 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.html("issues.almost_junction.self.message", {
+ 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.html("issues.almost_junction.message", {
+ return entity1 && entity2 ? _t.append("issues.almost_junction.message", {
feature: utilDisplayLabel(entity1, context2.graph()),
feature2: utilDisplayLabel(entity2, context2.graph())
}) : "";
@@ -39399,7 +42588,7 @@ ${content}
function makeFixes(context2) {
let fixes = [new validationIssueFix({
icon: "iD-icon-abutment",
- title: _t.html("issues.fix.connect_features.title"),
+ 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;
@@ -39410,7 +42599,10 @@ ${content}
if (nearEndNodes.length > 0) {
const collinear = findSmallJoinAngle(midNode, endNode, nearEndNodes);
if (collinear) {
- context3.perform(actionMergeNodes([collinear.id, endNode.id], collinear.loc), annotation);
+ context3.perform(
+ actionMergeNodes([collinear.id, endNode.id], collinear.loc),
+ annotation
+ );
return;
}
}
@@ -39419,9 +42611,15 @@ ${content}
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);
+ context3.perform(
+ actionMergeNodes([closestNodeInfo.node.id, endNode.id], closestNodeInfo.node.loc),
+ annotation
+ );
} else {
- context3.perform(actionAddMidpoint({ loc: crossLoc, edge: targetEdge }, endNode), annotation);
+ context3.perform(
+ actionAddMidpoint({ loc: crossLoc, edge: targetEdge }, endNode),
+ annotation
+ );
}
}
})];
@@ -39429,12 +42627,15 @@ ${content}
if (node && !node.hasInterestingTags()) {
fixes.push(new validationIssueFix({
icon: "maki-barrier",
- title: _t.html("issues.fix.tag_as_disconnected.title"),
+ 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"));
+ context3.perform(
+ actionChangeTags(nodeID, tags),
+ _t("issues.fix.tag_as_disconnected.annotation")
+ );
}
}));
}
@@ -39464,22 +42665,18 @@ ${content}
}
function findConnectableEndNodesByExtension(way) {
let results = [];
- if (way.isClosed())
- return 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;
+ if (!isExtendableCandidate(node, way)) return;
const connectionInfo = canConnectByExtend(way, nodeIndex);
- if (!connectionInfo)
- return;
+ if (!connectionInfo) return;
testNodes = graph.childNodes(way).slice();
testNodes[nodeIndex] = testNodes[nodeIndex].move(connectionInfo.cross_loc);
- if (geoHasSelfIntersections(testNodes, nodeID))
- return;
+ if (geoHasSelfIntersections(testNodes, nodeID)) return;
results.push(connectionInfo);
});
return results;
@@ -39488,8 +42685,8 @@ ${content}
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;
+ ].map((d2) => graph.entity(d2)).filter((d2) => {
+ return d2.id !== node.id && geoSphericalDistance(node.loc, d2.loc) <= CLOSE_NODE_TH;
});
}
function findSmallJoinAngle(midNode, tipNode, endNodes) {
@@ -39504,26 +42701,20 @@ ${content}
minAngle = diff;
}
});
- if (minAngle <= SIG_ANGLE_TH)
- return joinTo;
+ 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;
+ 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;
+ if (layer1 !== layer2) return false;
const level1 = way.tags.level || "0", level2 = way2.tags.level || "0";
- if (level1 !== level2)
- return false;
+ if (level1 !== level2) return false;
return true;
}
function canConnectByExtend(way, endNodeIdx) {
@@ -39540,19 +42731,16 @@ ${content}
[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 t2 = EXTEND_TH_METERS / edgeLen + 1;
+ const extTipLoc = geoVecInterp(midNode.loc, tipNode.loc, t2);
const segmentInfos = tree.waySegments(queryExtent, graph);
- for (let i2 = 0; i2 < segmentInfos.length; i2++) {
- let segmentInfo = segmentInfos[i2];
+ 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;
+ if (!isHighway(way2)) continue;
+ if (!canConnectWays(way, way2)) continue;
let nAid = segmentInfo.nodes[0], nBid = segmentInfo.nodes[1];
- if (nAid === tipNid || nBid === tipNid)
- continue;
+ 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) {
@@ -39568,13 +42756,13 @@ ${content}
return null;
}
};
- validation.type = type3;
+ validation.type = type2;
return validation;
}
// modules/validations/close_nodes.js
function validationCloseNodes(context) {
- var type3 = "close_nodes";
+ var type2 = "close_nodes";
var pointThresholdMeters = 0.2;
var validation = function(entity, graph) {
if (entity.type === "node") {
@@ -39592,47 +42780,36 @@ ${content}
}
}
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";
+ 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";
+ 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";
+ 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";
}
function shouldCheckWay(way) {
- if (way.nodes.length <= 2 || way.isClosed() && way.nodes.length <= 4)
- return false;
- var bbox = way.extent(graph).bbox();
- var hypotenuseMeters = geoSphericalDistance([bbox.minX, bbox.minY], [bbox.maxX, bbox.maxY]);
- if (hypotenuseMeters < 1.5)
- return false;
+ 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 getIssuesForWay(way) {
- if (!shouldCheckWay(way))
- return [];
+ 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];
+ 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 (issue) issues.push(issue);
}
return issues;
}
@@ -39640,13 +42817,11 @@ ${content}
var issues = [];
function checkForCloseness(node1, node2, way) {
var issue = getWayIssueIfAny(node1, node2, way);
- if (issue)
- issues.push(issue);
+ if (issue) issues.push(issue);
}
- for (var i2 = 0; i2 < parentWays.length; i2++) {
- var parentWay = parentWays[i2];
- if (!shouldCheckWay(parentWay))
- continue;
+ 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) {
@@ -39664,17 +42839,12 @@ ${content}
return issues;
}
function thresholdMetersForWay(way) {
- if (!shouldCheckWay(way))
- return 0;
+ 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;
+ 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) {
@@ -39690,11 +42860,11 @@ ${content}
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.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) {
@@ -39705,15 +42875,14 @@ ${content}
break;
}
}
- if (zAxisDifferentiates)
- continue;
+ if (zAxisDifferentiates) continue;
issues.push(new validationIssue({
- type: type3,
+ 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.html("issues.close_nodes.detached.message", {
+ return entity2 && entity22 ? _t.append("issues.close_nodes.detached.message", {
feature: utilDisplayLabel(entity2, context2.graph()),
feature2: utilDisplayLabel(entity22, context2.graph())
}) : "";
@@ -39724,11 +42893,11 @@ ${content}
return [
new validationIssueFix({
icon: "iD-operation-disconnect",
- title: _t.html("issues.fix.move_points_apart.title")
+ title: _t.append("issues.fix.move_points_apart.title")
}),
new validationIssueFix({
icon: "iD-icon-layers",
- title: _t.html("issues.fix.use_different_layers_or_levels.title")
+ title: _t.append("issues.fix.use_different_layers_or_levels.title")
})
];
}
@@ -39756,16 +42925,15 @@ ${content}
});
var threshold = Math.min(...thresholds);
var distance = geoSphericalDistance(node1.loc, node2.loc);
- if (distance > threshold)
- return null;
+ if (distance > threshold) return null;
}
return new validationIssue({
- type: type3,
+ type: type2,
subtype: "vertices",
severity: "warning",
message: function(context2) {
var entity2 = context2.hasEntity(this.entityIds[0]);
- return entity2 ? _t.html("issues.close_nodes.message", { way: utilDisplayLabel(entity2, context2.graph()) }) : "";
+ return entity2 ? _t.append("issues.close_nodes.message", { way: utilDisplayLabel(entity2, context2.graph()) }) : "";
},
reference: showReference,
entityIds: [way.id, node1.id, node2.id],
@@ -39774,7 +42942,7 @@ ${content}
return [
new validationIssueFix({
icon: "iD-icon-plus",
- title: _t.html("issues.fix.merge_points.title"),
+ title: _t.append("issues.fix.merge_points.title"),
onClick: function(context2) {
var entityIds = this.issue.entityIds;
var action = actionMergeNodes([entityIds[1], entityIds[2]]);
@@ -39783,7 +42951,7 @@ ${content}
}),
new validationIssueFix({
icon: "iD-operation-disconnect",
- title: _t.html("issues.fix.move_points_apart.title")
+ title: _t.append("issues.fix.move_points_apart.title")
})
];
}
@@ -39794,18 +42962,19 @@ ${content}
}
}
};
- validation.type = type3;
+ validation.type = type2;
return validation;
}
// modules/validations/crossing_ways.js
+ var import_lodash3 = __toESM(require_lodash());
function validationCrossingWays(context) {
- var type3 = "crossing_ways";
+ var type2 = "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];
+ for (var i3 = 0; i3 < parentRels.length; i3++) {
+ var rel = parentRels[i3];
if (getFeatureType(rel, graph) !== null) {
return rel;
}
@@ -39833,19 +43002,13 @@ ${content}
};
function getFeatureType(entity, graph) {
var geometry = entity.geometry(graph);
- if (geometry !== "line" && geometry !== "area")
- return null;
+ 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";
+ 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) {
@@ -39857,34 +43020,21 @@ ${content}
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 (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 (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;
+ if (layer1 !== layer2) return true;
}
return false;
}
@@ -39898,8 +43048,7 @@ ${content}
secondary: true,
secondary_link: true
};
- var nonCrossingHighways = { track: true };
- function tagsForConnectionNodeIfAllowed(entity1, entity2, graph) {
+ function tagsForConnectionNodeIfAllowed(entity1, entity2, graph, lessLikelyTags) {
var featureType1 = getFeatureType(entity1, graph);
var featureType2 = getFeatureType(entity2, graph);
var geometry1 = entity1.geometry(graph);
@@ -39911,43 +43060,39 @@ ${content}
var entity2IsPath = osmPathHighwayTagValues[entity2.tags.highway];
if ((entity1IsPath || entity2IsPath) && entity1IsPath !== entity2IsPath) {
var roadFeature = entity1IsPath ? entity2 : entity1;
- if (nonCrossingHighways[roadFeature.tags.highway]) {
+ var pathFeature = entity1IsPath ? entity1 : entity2;
+ if (roadFeature.tags.highway === "track") {
return {};
}
- var pathFeature = entity1IsPath ? entity1 : entity2;
- if (["marked", "unmarked"].indexOf(pathFeature.tags.crossing) !== -1) {
+ 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 (featureType1 === "waterway")
- return {};
- if (featureType1 === "railway")
- return {};
+ 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 {};
+ 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" };
+ if (isTram) return { railway: "tram_crossing" };
return { railway: "crossing" };
} else {
- if (isTram)
- return { railway: "tram_level_crossing" };
+ 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 (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;
}
@@ -39959,45 +43104,40 @@ ${content}
}
function findCrossingsByWay(way1, graph, tree) {
var edgeCrossInfos = [];
- if (way1.type !== "way")
- return edgeCrossInfos;
+ if (way1.type !== "way") return edgeCrossInfos;
var taggedFeature1 = getFeatureWithFeatureTypeTagsForWay(way1, graph);
var way1FeatureType = getFeatureType(taggedFeature1, graph);
- if (way1FeatureType === null)
- return edgeCrossInfos;
+ if (way1FeatureType === null) return edgeCrossInfos;
var checkedSingleCrossingWays = {};
- var i2, j2;
+ var i3, j2;
var extent;
- var n1, n2, nA, nB, nAId, nBId;
+ 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 (i2 = 0; i2 < way1Nodes.length - 1; i2++) {
- n1 = way1Nodes[i2];
- n2 = way1Nodes[i2 + 1];
+ for (i3 = 0; i3 < way1Nodes.length - 1; i3++) {
+ n1 = way1Nodes[i3];
+ n22 = way1Nodes[i3 + 1];
extent = geoExtent([
[
- Math.min(n1.loc[0], n2.loc[0]),
- Math.min(n1.loc[1], n2.loc[1])
+ Math.min(n1.loc[0], n22.loc[0]),
+ Math.min(n1.loc[1], n22.loc[1])
],
[
- Math.max(n1.loc[0], n2.loc[0]),
- Math.max(n1.loc[1], n2.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;
+ if (segment2Info.wayId === way1.id) continue;
+ if (checkedSingleCrossingWays[segment2Info.wayId]) continue;
comparedWays[segment2Info.wayId] = true;
way2 = graph.hasEntity(segment2Info.wayId);
- if (!way2)
- continue;
+ if (!way2) continue;
taggedFeature2 = getFeatureWithFeatureTypeTagsForWay(way2, graph);
way2FeatureType = getFeatureType(taggedFeature2, graph);
if (way2FeatureType === null || isLegitCrossing(taggedFeature1.tags, way1FeatureType, taggedFeature2.tags, way2FeatureType)) {
@@ -40006,16 +43146,14 @@ ${content}
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) {
+ if (nAId === n1.id || nAId === n22.id || nBId === n1.id || nBId === n22.id) {
continue;
}
nA = graph.hasEntity(nAId);
- if (!nA)
- continue;
+ if (!nA) continue;
nB = graph.hasEntity(nBId);
- if (!nB)
- continue;
- segment1 = [n1.loc, n2.loc];
+ if (!nB) continue;
+ segment1 = [n1.loc, n22.loc];
segment2 = [nA.loc, nB.loc];
var point = geoLineIntersection(segment1, segment2);
if (point) {
@@ -40024,7 +43162,7 @@ ${content}
{
way: way1,
featureType: way1FeatureType,
- edge: [n1.id, n2.id]
+ edge: [n1.id, n22.id]
},
{
way: way2,
@@ -40045,13 +43183,13 @@ ${content}
}
function waysToCheck(entity, graph) {
var featureType = getFeatureType(entity, graph);
- if (!featureType)
- return [];
+ 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")) {
+ 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);
@@ -40113,13 +43251,13 @@ ${content}
}
var uniqueID = crossing.crossPoint[0].toFixed(4) + "," + crossing.crossPoint[1].toFixed(4);
return new validationIssue({
- type: type3,
+ type: type2,
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.html("issues.crossing_ways.message", {
+ return entity1 && entity2 ? _t.append("issues.crossing_ways.message", {
feature: utilDisplayLabel(entity1, graph2),
feature2: utilDisplayLabel(entity2, graph2)
}) : "";
@@ -40137,19 +43275,22 @@ ${content}
loc: crossing.crossPoint,
dynamicFixes: function(context2) {
var mode = context2.mode();
- if (!mode || mode.id !== "select" || mode.selectedIDs().length !== 1)
- return [];
+ 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));
+ let lessLikelyConnectionTags = tagsForConnectionNodeIfAllowed(entities[0], entities[1], graph, true);
+ if (lessLikelyConnectionTags && !(0, import_lodash3.isEqual)(connectionTags, lessLikelyConnectionTags)) {
+ fixes.push(makeConnectWaysFix(lessLikelyConnectionTags));
+ }
}
if (isCrossingIndoors) {
fixes.push(new validationIssueFix({
icon: "iD-icon-layers",
- title: _t.html("issues.fix.use_different_levels.title")
+ title: _t.append("issues.fix.use_different_levels.title")
}));
} else if (isCrossingTunnels || isCrossingBridges || featureType1 === "building" || featureType2 === "building") {
fixes.push(makeChangeLayerFix("higher"));
@@ -40165,7 +43306,7 @@ ${content}
}
fixes.push(new validationIssueFix({
icon: "iD-operation-move",
- title: _t.html("issues.fix.reposition_features.title")
+ title: _t.append("issues.fix.reposition_features.title")
}));
return fixes;
}
@@ -40177,17 +43318,14 @@ ${content}
function makeAddBridgeOrTunnelFix(fixTitleID, iconName, bridgeOrTunnel) {
return new validationIssueFix({
icon: iconName,
- title: _t.html("issues.fix." + fixTitleID + ".title"),
+ title: _t.append("issues.fix." + fixTitleID + ".title"),
onClick: function(context2) {
var mode = context2.mode();
- if (!mode || mode.id !== "select")
- return;
+ if (!mode || mode.id !== "select") return;
var selectedIDs = mode.selectedIDs();
- if (selectedIDs.length !== 1)
- return;
+ if (selectedIDs.length !== 1) return;
var selectedWayID = selectedIDs[0];
- if (!context2.hasEntity(selectedWayID))
- return;
+ if (!context2.hasEntity(selectedWayID)) return;
var resultWayIDs = [selectedWayID];
var edge, crossedEdge, crossedWayID;
if (this.issue.entityIds[0] === selectedWayID) {
@@ -40204,7 +43342,7 @@ ${content}
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);
+ var structLengthMeters = crossedWay && isFinite(crossedWay.tags.width) && Number(crossedWay.tags.width);
if (!structLengthMeters) {
structLengthMeters = crossedWay && crossedWay.impliedLineWidthMeters();
}
@@ -40218,8 +43356,7 @@ ${content}
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;
+ if (crossingAngle > Math.PI) crossingAngle -= Math.PI;
structLengthMeters = structLengthMeters / 2 / Math.sin(crossingAngle) * 2;
structLengthMeters += 4;
structLengthMeters = Math.min(Math.max(structLengthMeters, 4), 50);
@@ -40285,8 +43422,7 @@ ${content}
}
}
}
- if (!newNode)
- newNode = endNode;
+ if (!newNode) newNode = endNode;
var splitAction = actionSplit([newNode.id]).limitWays(resultWayIDs);
graph = splitAction(graph);
if (splitAction.getCreatedWayIDs().length) {
@@ -40323,57 +43459,63 @@ ${content}
}
function makeConnectWaysFix(connectionTags) {
var fixTitleID = "connect_features";
+ var fixIcon = "iD-icon-crossing";
+ if (connectionTags.highway === "crossing") {
+ fixTitleID = "connect_using_crossing";
+ fixIcon = "temaki-pedestrian";
+ }
if (connectionTags.ford) {
fixTitleID = "connect_using_ford";
+ fixIcon = "roentgen-ford";
}
- return new validationIssueFix({
- icon: "iD-icon-crossing",
- title: _t.html("issues.fix." + fixTitleID + ".title"),
+ const fix = new validationIssueFix({
+ icon: fixIcon,
+ 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);
+ 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);
+ }
+ });
+ if (nodesToMerge.length > 1) {
+ graph = actionMergeNodes(nodesToMerge, loc)(graph);
}
- });
- if (nodesToMerge.length > 1) {
- graph = actionMergeNodes(nodesToMerge, loc)(graph);
- }
- return graph;
- }, _t("issues.fix.connect_crossing_features.annotation"));
+ return graph;
+ },
+ _t("issues.fix.connect_crossing_features.annotation")
+ );
}
});
+ fix._connectionTags = connectionTags;
+ return fix;
}
function makeChangeLayerFix(higherOrLower) {
return new validationIssueFix({
icon: "iD-icon-" + (higherOrLower === "higher" ? "up" : "down"),
- title: _t.html("issues.fix.tag_this_as_" + higherOrLower + ".title"),
+ title: _t.append("issues.fix.tag_this_as_" + higherOrLower + ".title"),
onClick: function(context2) {
var mode = context2.mode();
- if (!mode || mode.id !== "select")
- return;
+ if (!mode || mode.id !== "select") return;
var selectedIDs = mode.selectedIDs();
- if (selectedIDs.length !== 1)
- return;
+ if (selectedIDs.length !== 1) return;
var selectedID = selectedIDs[0];
if (!this.issue.entityIds.some(function(entityId) {
return entityId === selectedID;
- }))
- return;
+ })) return;
var entity = context2.hasEntity(selectedID);
- if (!entity)
- return;
+ if (!entity) return;
var tags = Object.assign({}, entity.tags);
var layer = tags.layer && Number(tags.layer);
if (layer && !isNaN(layer)) {
@@ -40390,18 +43532,21 @@ ${content}
}
}
tags.layer = layer.toString();
- context2.perform(actionChangeTags(entity.id, tags), _t("operations.change_tags.annotation"));
+ context2.perform(
+ actionChangeTags(entity.id, tags),
+ _t("operations.change_tags.annotation")
+ );
}
});
}
- validation.type = type3;
+ validation.type = type2;
return validation;
}
// modules/behavior/draw_way.js
function behaviorDrawWay(context, wayID, mode, startGraph) {
const keybinding = utilKeybinding("drawWay");
- var dispatch10 = dispatch_default("rejectedSelfIntersection");
+ var dispatch14 = dispatch_default("rejectedSelfIntersection");
var behavior = behaviorDraw(context);
var _nodeIndex;
var _origWay;
@@ -40423,10 +43568,13 @@ ${content}
}
function removeDrawNode() {
context.pauseChangeDispatch();
- context.replace(function actionDeleteDrawNode(graph) {
- var way = graph.entity(wayID);
- return graph.replace(way.removeNode(_drawNode.id)).remove(_drawNode);
- }, _annotation);
+ 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();
}
@@ -40446,13 +43594,12 @@ ${content}
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 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);
+ 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;
@@ -40466,7 +43613,10 @@ ${content}
}
context.replace(actionMoveNode(_drawNode.id, loc), _annotation);
_drawNode = context.entity(_drawNode.id);
- checkGeometry(true);
+ checkGeometry(
+ true
+ /* includeDrawNode */
+ );
}
function checkGeometry(includeDrawNode) {
var nopeDisabled = context.surface().classed("nope-disabled");
@@ -40487,10 +43637,8 @@ ${content}
}
} else {
if (parentWay.isClosed()) {
- if (nodes.length < 3)
- return false;
- if (_drawNode)
- nodes.splice(-2, 1);
+ if (nodes.length < 3) return false;
+ if (_drawNode) nodes.splice(-2, 1);
testNode = nodes[nodes.length - 2];
} else {
return false;
@@ -40514,8 +43662,7 @@ ${content}
context.enter(nextMode);
}
function setActiveElements() {
- if (!_drawNode)
- return;
+ if (!_drawNode) return;
context.surface().selectAll("." + _drawNode.id).classed("active", true);
}
function resetToStartGraph() {
@@ -40535,7 +43682,9 @@ ${content}
_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);
+ _annotation = _t(
+ (_origWay.nodes.length === (_origWay.isClosed() ? 2 : 1) ? "operations.start.annotation." : "operations.continue.annotation.") + _wayGeometry
+ );
_pointerHasMoved = false;
context.pauseChangeDispatch();
context.perform(actionNoop(), _annotation);
@@ -40547,8 +43696,7 @@ ${content}
}).on("down", function() {
move.apply(this, arguments);
}).on("downcancel", function() {
- if (_drawNode)
- removeDrawNode();
+ 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);
@@ -40570,19 +43718,22 @@ ${content}
select_default2(window).on("keydown.drawWay", null).on("keyup.drawWay", null);
context.history().on("undone.draw", null);
};
- function attemptAdd(d, loc, doAdd) {
+ function attemptAdd(d2, loc, doAdd) {
if (_drawNode) {
context.replace(actionMoveNode(_drawNode.id, loc), _annotation);
_drawNode = context.entity(_drawNode.id);
} else {
createDrawNode(loc);
}
- checkGeometry(true);
- if (d && d.properties && d.properties.nope || context.surface().classed("nope")) {
+ checkGeometry(
+ true
+ /* includeDrawNode */
+ );
+ if (d2 && d2.properties && d2.properties.nope || context.surface().classed("nope")) {
if (!_pointerHasMoved) {
removeDrawNode();
}
- dispatch10.call("rejectedSelfIntersection", this);
+ dispatch14.call("rejectedSelfIntersection", this);
return;
}
context.pauseChangeDispatch();
@@ -40591,54 +43742,58 @@ ${content}
context.resumeChangeDispatch();
context.enter(mode);
}
- drawWay.add = function(loc, d) {
- attemptAdd(d, loc, function() {
+ drawWay.add = function(loc, d2) {
+ attemptAdd(d2, loc, function() {
});
};
- drawWay.addWay = function(loc, edge, d) {
- attemptAdd(d, loc, function() {
- context.replace(actionAddMidpoint({ loc, edge }, _drawNode), _annotation);
+ drawWay.addWay = function(loc, edge, d2) {
+ attemptAdd(d2, 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.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;
}
- 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);
+ 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";
+ if (ways.every((way) => way.isClosed())) return "area";
+ if (ways.every((way) => !way.isClosed())) return "line";
return "generic";
}
function followMode() {
- if (_didResolveTempEdit)
- return;
+ 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.html("operations.follow.error.needs_more_initial_nodes"))();
+ 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 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.html(`operations.follow.error.intersection_of_multiple_ways.${featureType}`))();
+ 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((n2) => n2.id === lastNodesParents[0].id)) {
- context.ui().flash.duration(4e3).iconName("#iD-icon-no").label(_t.html(`operations.follow.error.intersection_of_different_ways.${featureType}`))();
+ 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];
@@ -40646,24 +43801,26 @@ ${content}
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;
+ 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.html("operations.follow.error.unknown"))();
+ } catch (e3) {
+ 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);
+ checkGeometry(
+ false
+ /* includeDrawNode */
+ );
if (context.surface().classed("nope")) {
- dispatch10.call("rejectedSelfIntersection", this);
+ dispatch14.call("rejectedSelfIntersection", this);
return;
}
context.pauseChangeDispatch();
@@ -40692,17 +43849,15 @@ ${content}
context.enter(modeBrowse(context));
};
drawWay.nodeIndex = function(val) {
- if (!arguments.length)
- return _nodeIndex;
+ if (!arguments.length) return _nodeIndex;
_nodeIndex = val;
return drawWay;
};
drawWay.activeID = function() {
- if (!arguments.length)
- return _drawNode && _drawNode.id;
+ if (!arguments.length) return _drawNode && _drawNode.id;
return drawWay;
};
- return utilRebind(drawWay, dispatch10, "on");
+ return utilRebind(drawWay, dispatch14, "on");
}
// modules/modes/draw_line.js
@@ -40712,7 +43867,7 @@ ${content}
id: "draw-line"
};
var behavior = behaviorDrawWay(context, wayID, mode, startGraph).on("rejectedSelfIntersection.modeDrawLine", function() {
- context.ui().flash.iconName("#iD-icon-no").label(_t.html("self_intersection.error.lines"))();
+ context.ui().flash.iconName("#iD-icon-no").label(_t.append("self_intersection.error.lines"))();
});
mode.wayID = wayID;
mode.isContinuing = continuing;
@@ -40734,22 +43889,21 @@ ${content}
// modules/validations/disconnected_way.js
function validationDisconnectedWay() {
- var type3 = "disconnected_way";
+ var type2 = "disconnected_way";
function isTaggedAsHighway(entity) {
return osmRoutableHighwayTagValues[entity.tags.highway];
}
var validation = function checkDisconnectedWay(entity, graph) {
var routingIslandWays = routingIslandForEntity(entity);
- if (!routingIslandWays)
- return [];
+ if (!routingIslandWays) return [];
return [new validationIssue({
- type: type3,
+ type: type2,
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.html("issues.disconnected_way.routable.message", { count: this.entityIds.length, highway: label });
+ return _t.append("issues.disconnected_way.routable.message", { count: this.entityIds.length, highway: label });
},
reference: showReference,
entityIds: Array.from(routingIslandWays).map(function(way) {
@@ -40764,32 +43918,30 @@ ${content}
if (singleEntity.type === "way" && !singleEntity.isClosed()) {
var textDirection = _mainLocalizer.textDirection();
var startFix = makeContinueDrawingFixIfAllowed(textDirection, singleEntity.first(), "start");
- if (startFix)
- fixes.push(startFix);
+ if (startFix) fixes.push(startFix);
var endFix = makeContinueDrawingFixIfAllowed(textDirection, singleEntity.last(), "end");
- if (endFix)
- fixes.push(endFix);
+ if (endFix) fixes.push(endFix);
}
if (!fixes.length) {
fixes.push(new validationIssueFix({
- title: _t.html("issues.fix.connect_feature.title")
+ title: _t.append("issues.fix.connect_feature.title")
}));
}
fixes.push(new validationIssueFix({
icon: "iD-operation-delete",
- title: _t.html("issues.fix.delete_feature.title"),
+ 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();
+ var operation2 = operationDelete(context2, [id2]);
+ if (!operation2.disabled()) {
+ operation2();
}
}
}));
} else {
fixes.push(new validationIssueFix({
- title: _t.html("issues.fix.connect_features.title")
+ title: _t.append("issues.fix.connect_features.title")
}));
}
return fixes;
@@ -40802,7 +43954,8 @@ ${content}
var waysToCheck = [];
function queueParentWays(node) {
graph.parentWays(node).forEach(function(parentWay) {
- if (!routingIsland.has(parentWay) && isRoutableWay(parentWay, false)) {
+ if (!routingIsland.has(parentWay) && // only check each feature once
+ isRoutableWay(parentWay, false)) {
routingIsland.add(parentWay);
waysToCheck.push(parentWay);
}
@@ -40820,8 +43973,8 @@ ${content}
while (waysToCheck.length) {
var wayToCheck = waysToCheck.pop();
var childNodes = graph.childNodes(wayToCheck);
- for (var i2 in childNodes) {
- var vertex = childNodes[i2];
+ for (var i3 in childNodes) {
+ var vertex = childNodes[i3];
if (isConnectedVertex(vertex)) {
return null;
}
@@ -40835,62 +43988,55 @@ ${content}
}
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;
+ 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;
+ if (node.tags.highway === "elevator") return true;
return false;
}
function isRoutableWay(way, ignoreInnerWays) {
- if (isTaggedAsHighway(way) || way.tags.route === "ferry")
- return true;
+ 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;
+ 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;
+ 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.html("issues.fix.continue_from_" + whichEnd + ".title"),
+ 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;
+ 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));
+ context.enter(
+ modeDrawLine(context, wayId, context.graph(), "line", way.affix(vertexId), true)
+ );
}
});
}
};
- validation.type = type3;
+ validation.type = type2;
return validation;
}
// modules/validations/invalid_format.js
function validationFormatting() {
- var type3 = "invalid_format";
+ var type2 = "invalid_format";
var validation = function(entity) {
var issues = [];
function isValidEmail(email) {
@@ -40901,19 +44047,22 @@ ${content}
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);
+ 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: type3,
+ type: type2,
subtype: "email",
severity: "warning",
message: function(context) {
var entity2 = context.hasEntity(this.entityIds[0]);
- return entity2 ? _t.html("issues.invalid_format.email.message" + this.data, { feature: utilDisplayLabel(entity2, context.graph()), email: emails.join(", ") }) : "";
+ return entity2 ? _t.append(
+ "issues.invalid_format.email.message" + this.data,
+ { feature: utilDisplayLabel(entity2, context.graph()), email: emails.join(", ") }
+ ) : "";
},
reference: showReferenceEmail,
entityIds: [entity.id],
@@ -40924,37 +44073,39 @@ ${content}
}
return issues;
};
- validation.type = type3;
+ validation.type = type2;
return validation;
}
// modules/validations/help_request.js
function validationHelpRequest(context) {
- var type3 = "help_request";
+ var type2 = "help_request";
var validation = function checkFixmeTag(entity) {
- if (!entity.tags.fixme)
- return [];
- if (entity.version === void 0)
- return [];
+ 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 [];
+ if (!baseEntity || !baseEntity.tags.fixme) return [];
}
return [new validationIssue({
- type: type3,
+ type: type2,
subtype: "fixme_tag",
severity: "warning",
message: function(context2) {
var entity2 = context2.hasEntity(this.entityIds[0]);
- return entity2 ? _t.html("issues.fixme_tag.message", {
- feature: utilDisplayLabel(entity2, context2.graph(), true)
+ return entity2 ? _t.append("issues.fixme_tag.message", {
+ feature: utilDisplayLabel(
+ entity2,
+ context2.graph(),
+ true
+ /* verbose */
+ )
}) : "";
},
dynamicFixes: function() {
return [
new validationIssueFix({
- title: _t.html("issues.fix.address_the_concern.title")
+ title: _t.append("issues.fix.address_the_concern.title")
})
];
},
@@ -40965,39 +44116,30 @@ ${content}
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/validations/impossible_oneway.js
function validationImpossibleOneway() {
- var type3 = "impossible_oneway";
+ 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 [];
+ 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";
+ 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;
+ 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;
@@ -41010,8 +44152,7 @@ ${content}
for (var index in way.nodes) {
if (way.nodes[index] === nodeID) {
occurrences += 1;
- if (occurrences > 1)
- return true;
+ if (occurrences > 1) return true;
}
}
return false;
@@ -41019,35 +44160,26 @@ ${content}
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;
+ 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;
+ if (node.tags.natural === "spring") return true;
} else {
- if (node.tags.manhole === "drain")
- return true;
+ if (node.tags.manhole === "drain") return true;
}
}
return graph.parentWays(node).some(function(parentWay) {
- if (parentWay.id === way.id)
- return false;
+ 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;
+ 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;
+ 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;
+ if (parentWay.tags.natural === "water" || parentWay.tags.natural === "coastline") return true;
}
return false;
});
@@ -41055,38 +44187,28 @@ ${content}
function issuesForNode(way, nodeID) {
var isFirst = nodeID === way.first();
var wayType = typeForWay(way);
- if (nodeOccursMoreThanOnce(way, nodeID))
- return [];
+ if (nodeOccursMoreThanOnce(way, nodeID)) return [];
var osm = services.osm;
- if (!osm)
- return [];
+ if (!osm) return [];
var node = graph.hasEntity(nodeID);
- if (!node || !osm.isDataLoaded(node.loc))
- return [];
- if (isConnectedViaOtherTypes(way, node))
- return [];
+ 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;
+ if (parentWay.id === way.id) return false;
return typeForWay(parentWay) === wayType;
});
- if (wayType === "waterway" && attachedWaysOfSameType.length === 0)
- return [];
+ 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 < 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;
+ if ((isFirst ? attachedOneway.first() : attachedOneway.last()) !== nodeID) return true;
+ if (nodeOccursMoreThanOnce(attachedOneway, nodeID)) return true;
return false;
});
- if (connectedEndpointsOkay)
- return [];
+ if (connectedEndpointsOkay) return [];
}
var placement = isFirst ? "start" : "end", messageID = wayType + ".", referenceID = wayType + ".";
if (wayType === "waterway") {
@@ -41097,12 +44219,12 @@ ${content}
referenceID += placement;
}
return [new validationIssue({
- type: type3,
+ type: type2,
subtype: wayType,
severity: "warning",
message: function(context) {
var entity2 = context.hasEntity(this.entityIds[0]);
- return entity2 ? _t.html("issues.impossible_oneway." + messageID + ".message", {
+ return entity2 ? _t.append("issues.impossible_oneway." + messageID + ".message", {
feature: utilDisplayLabel(entity2, context.graph())
}) : "";
},
@@ -41113,7 +44235,7 @@ ${content}
if (attachedOneways.length) {
fixes.push(new validationIssueFix({
icon: "iD-operation-reverse",
- title: _t.html("issues.fix.reverse_feature.title"),
+ title: _t.append("issues.fix.reverse_feature.title"),
entityIds: [way.id],
onClick: function(context) {
var id2 = this.issue.entityIds[0];
@@ -41126,7 +44248,7 @@ ${content}
var useLeftContinue = isFirst && textDirection === "ltr" || !isFirst && textDirection === "rtl";
fixes.push(new validationIssueFix({
icon: "iD-operation-continue" + (useLeftContinue ? "-left" : ""),
- title: _t.html("issues.fix.continue_from_" + (isFirst ? "start" : "end") + ".title"),
+ 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];
@@ -41152,15 +44274,17 @@ ${content}
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));
+ context.enter(
+ modeDrawLine(context, way.id, context.graph(), "line", way.affix(vertex.id), true)
+ );
}
- validation.type = type3;
+ validation.type = type2;
return validation;
}
// modules/validations/incompatible_source.js
function validationIncompatibleSource() {
- const type3 = "incompatible_source";
+ const type2 = "incompatible_source";
const incompatibleRules = [
{
id: "amap",
@@ -41178,26 +44302,27 @@ ${content}
];
const validation = function checkIncompatibleSource(entity) {
const entitySources = entity.tags && entity.tags.source && entity.tags.source.split(";");
- if (!entitySources)
- return [];
+ 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;
+ if (!rule.regex.test(source)) return false;
+ if (rule.exceptRegex && rule.exceptRegex.test(source)) return false;
return true;
});
- if (!matchRule)
- return null;
+ if (!matchRule) return null;
return new validationIssue({
- type: type3,
+ type: type2,
severity: "warning",
message: (context) => {
const entity2 = context.hasEntity(entityID);
- return entity2 ? _t.html("issues.incompatible_source.feature.message", {
- feature: utilDisplayLabel(entity2, context.graph(), true),
+ return entity2 ? _t.append("issues.incompatible_source.feature.message", {
+ feature: utilDisplayLabel(
+ entity2,
+ context.graph(),
+ true
+ /* verbose */
+ ),
value: source
}) : "";
},
@@ -41206,60 +44331,60 @@ ${content}
hash: source,
dynamicFixes: () => {
return [
- new validationIssueFix({ title: _t.html("issues.fix.remove_proprietary_data.title") })
+ 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.${id2}`));
+ selection2.selectAll(".issue-reference").data([0]).enter().append("div").attr("class", "issue-reference").call(_t.append("issues.incompatible_source.reference.".concat(id2)));
};
}
};
- validation.type = type3;
+ validation.type = type2;
return validation;
}
// modules/validations/maprules.js
function validationMaprules() {
- var type3 = "maprules";
+ var type2 = "maprules";
var validation = function checkMaprules(entity, graph) {
- if (!services.maprules)
- return [];
+ if (!services.maprules) return [];
var rules = services.maprules.validationRules();
var issues = [];
- for (var i2 = 0; i2 < rules.length; i2++) {
- var rule = rules[i2];
+ for (var i3 = 0; i3 < rules.length; i3++) {
+ var rule = rules[i3];
rule.findIssues(entity, graph, issues);
}
return issues;
};
- validation.type = type3;
+ validation.type = type2;
return validation;
}
// modules/validations/mismatched_geometry.js
var import_fast_deep_equal4 = __toESM(require_fast_deep_equal());
function validationMismatchedGeometry() {
- var type3 = "mismatched_geometry";
+ var type2 = "mismatched_geometry";
function tagSuggestingLineIsArea(entity) {
- if (entity.type !== "way" || entity.isClosed())
- return null;
+ 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) {
+ if (asLine && asArea && (0, import_fast_deep_equal4.default)(asLine.tags, asArea.tags)) {
+ return null;
+ }
+ if (asLine.isFallback() && asArea.isFallback() && !(0, import_fast_deep_equal4.default)(tagSuggestingArea, { area: "yes" })) {
return null;
}
return tagSuggestingArea;
}
function makeConnectEndpointsFixOnClick(way, graph) {
- if (way.nodes.length < 3)
- return null;
+ 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) {
@@ -41269,7 +44394,10 @@ ${content}
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"));
+ context.perform(
+ actionMergeNodes([way2.nodes[0], way2.nodes[way2.nodes.length - 1]], nodes[0].loc),
+ _t("issues.fix.connect_endpoints.annotation")
+ );
};
}
}
@@ -41281,22 +44409,41 @@ ${content}
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"));
+ context.perform(
+ actionAddVertex(wayId, nodeId, index),
+ _t("issues.fix.connect_endpoints.annotation")
+ );
};
}
}
function lineTaggedAsAreaIssue(entity) {
var tagSuggestingArea = tagSuggestingLineIsArea(entity);
- if (!tagSuggestingArea)
- return null;
+ 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;
+ }
+ if (Object.keys(presetAsLine.tags).length === 0) {
+ validAsLine = false;
+ }
+ }
return new validationIssue({
- type: type3,
+ type: type2,
subtype: "area_as_line",
severity: "warning",
message: function(context) {
var entity2 = context.hasEntity(this.entityIds[0]);
- return entity2 ? _t.html("issues.tag_suggests_area.message", {
- feature: utilDisplayLabel(entity2, "area", true),
+ return entity2 ? _t.append("issues.tag_suggests_area.message", {
+ feature: utilDisplayLabel(
+ entity2,
+ "area",
+ true
+ /* verbose */
+ ),
tag: utilTagText({ tags: tagSuggestingArea })
}) : "";
},
@@ -41307,21 +44454,26 @@ ${content}
var fixes = [];
var entity2 = context.entity(this.entityIds[0]);
var connectEndsOnClick = makeConnectEndpointsFixOnClick(entity2, context.graph());
- fixes.push(new validationIssueFix({
- title: _t.html("issues.fix.connect_endpoints.title"),
- onClick: connectEndsOnClick
- }));
+ if (!validAsLine) {
+ fixes.push(new validationIssueFix({
+ title: _t.append("issues.fix.connect_endpoints.title"),
+ onClick: connectEndsOnClick
+ }));
+ }
fixes.push(new validationIssueFix({
icon: "iD-operation-delete",
- title: _t.html("issues.fix.remove_tag.title"),
+ 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 key in tagSuggestingArea) {
- delete tags[key];
+ for (var key2 in tagSuggestingArea) {
+ delete tags[key2];
}
- context2.perform(actionChangeTags(entityId, tags), _t("issues.fix.remove_tag.annotation"));
+ context2.perform(
+ actionChangeTags(entityId, tags),
+ _t("issues.fix.remove_tag.annotation")
+ );
}
}));
return fixes;
@@ -41332,23 +44484,25 @@ ${content}
}
}
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;
+ 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,
+ type: type2,
subtype: "vertex_as_point",
severity: "warning",
message: function(context) {
var entity2 = context.hasEntity(this.entityIds[0]);
- return entity2 ? _t.html("issues.vertex_as_point.message", {
- feature: utilDisplayLabel(entity2, "vertex", true)
+ return entity2 ? _t.append("issues.vertex_as_point.message", {
+ feature: utilDisplayLabel(
+ entity2,
+ "vertex",
+ true
+ /* verbose */
+ )
}) : "";
},
reference: function showReference(selection2) {
@@ -41358,13 +44512,18 @@ ${content}
});
} else if (geometry === "vertex" && !allowedGeometries.vertex && allowedGeometries.point) {
return new validationIssue({
- type: type3,
+ type: type2,
subtype: "point_as_vertex",
severity: "warning",
message: function(context) {
var entity2 = context.hasEntity(this.entityIds[0]);
- return entity2 ? _t.html("issues.point_as_vertex.message", {
- feature: utilDisplayLabel(entity2, "point", true)
+ return entity2 ? _t.append("issues.point_as_vertex.message", {
+ feature: utilDisplayLabel(
+ entity2,
+ "point",
+ true
+ /* verbose */
+ )
}) : "";
},
reference: function showReference(selection2) {
@@ -41377,37 +44536,31 @@ ${content}
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;
+ 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");
+ 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;
+ const asTarget = _mainPresetIndex.matchTags(
+ entity.tags,
+ nodeGeom,
+ entity.extent(graph).center()
+ );
+ 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;
+ if (primaryKey === "building") return false;
+ if (asTarget.tags[primaryKey] === "*") return false;
return asSource.isFallback() || asSource.tags[primaryKey] === "*";
});
- if (!targetGeom)
- return null;
+ if (!targetGeom) return null;
var subtype = targetGeom + "_as_" + sourceGeom;
- if (targetGeom === "vertex")
- targetGeom = "point";
- if (sourceGeom === "vertex")
- sourceGeom = "point";
+ if (targetGeom === "vertex") targetGeom = "point";
+ if (sourceGeom === "vertex") sourceGeom = "point";
var referenceId = targetGeom + "_as_" + sourceGeom;
var dynamicFixes;
if (targetGeom === "point") {
@@ -41416,13 +44569,18 @@ ${content}
dynamicFixes = lineToAreaDynamicFixes;
}
return new validationIssue({
- type: type3,
+ type: type2,
subtype,
severity: "warning",
message: function(context) {
var entity2 = context.hasEntity(this.entityIds[0]);
- return entity2 ? _t.html("issues." + referenceId + ".message", {
- feature: utilDisplayLabel(entity2, targetGeom, true)
+ return entity2 ? _t.append("issues." + referenceId + ".message", {
+ feature: utilDisplayLabel(
+ entity2,
+ targetGeom,
+ true
+ /* verbose */
+ )
}) : "";
},
reference: function showReference(selection2) {
@@ -41446,13 +44604,16 @@ ${content}
if (tags2.area) {
delete tags2.area;
}
- context2.perform(actionChangeTags(entityId2, tags2), _t("issues.fix.convert_to_line.annotation"));
+ context2.perform(
+ actionChangeTags(entityId2, tags2),
+ _t("issues.fix.convert_to_line.annotation")
+ );
};
}
return [
new validationIssueFix({
icon: "iD-icon-line",
- title: _t.html("issues.fix.convert_to_line.title"),
+ title: _t.append("issues.fix.convert_to_line.title"),
onClick: convertOnClick
})
];
@@ -41464,39 +44625,45 @@ ${content}
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.perform(
+ action,
+ _t("operations.extract.annotation", { n: 1 })
+ );
context2.enter(modeSelect(context2, [action.getExtractedNodeID()]));
};
}
return [
new validationIssueFix({
icon: "iD-operation-extract",
- title: _t.html("issues.fix.extract_point.title"),
+ 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 [];
+ 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 i2 in sequences) {
- var sequence = sequences[i2];
- if (!sequence.nodes)
- continue;
+ 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;
+ if (firstNode === lastNode) continue;
var issue = new validationIssue({
- type: type3,
+ type: type2,
subtype: "unclosed_multipolygon_part",
severity: "warning",
message: function(context) {
var entity2 = context.hasEntity(this.entityIds[0]);
- return entity2 ? _t.html("issues.unclosed_multipolygon_part.message", {
- feature: utilDisplayLabel(entity2, context.graph(), true)
+ return entity2 ? _t.append("issues.unclosed_multipolygon_part.message", {
+ feature: utilDisplayLabel(
+ entity2,
+ context.graph(),
+ true
+ /* verbose */
+ )
}) : "";
},
reference: showReference,
@@ -41515,29 +44682,25 @@ ${content}
}
var validation = function checkMismatchedGeometry(entity, graph) {
var vertexPoint = vertexPointIssue(entity, graph);
- if (vertexPoint)
- return [vertexPoint];
+ if (vertexPoint) return [vertexPoint];
var lineAsArea = lineTaggedAsAreaIssue(entity);
- if (lineAsArea)
- return [lineAsArea];
+ if (lineAsArea) return [lineAsArea];
var mismatch = otherMismatchIssue(entity, graph);
- if (mismatch)
- return [mismatch];
+ if (mismatch) return [mismatch];
return unclosedMultipolygonPartIssues(entity, graph);
};
- validation.type = type3;
+ validation.type = type2;
return validation;
}
// modules/validations/missing_role.js
function validationMissingRole() {
- var type3 = "missing_role";
+ 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;
+ if (!relation.isMultipolygon()) return;
var member = relation.memberById(entity.id);
if (member && isMissingRole(member)) {
issues.push(makeIssue(entity, relation, member));
@@ -41558,11 +44721,11 @@ ${content}
}
function makeIssue(way, relation, member) {
return new validationIssue({
- type: type3,
+ type: type2,
severity: "warning",
message: function(context) {
var member2 = context.hasEntity(this.entityIds[1]), relation2 = context.hasEntity(this.entityIds[0]);
- return member2 && relation2 ? _t.html("issues.missing_role.message", {
+ return member2 && relation2 ? _t.append("issues.missing_role.message", {
member: utilDisplayLabel(member2, context.graph()),
relation: utilDisplayLabel(relation2, context.graph())
}) : "";
@@ -41579,11 +44742,14 @@ ${content}
makeAddRoleFix("outer"),
new validationIssueFix({
icon: "iD-operation-delete",
- title: _t.html("issues.fix.remove_from_relation.title"),
+ 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
- }));
+ context.perform(
+ actionDeleteMember(this.issue.entityIds[0], this.issue.data.member.index),
+ _t("operations.delete_member.annotation", {
+ n: 1
+ })
+ );
}
})
];
@@ -41595,34 +44761,36 @@ ${content}
}
function makeAddRoleFix(role) {
return new validationIssueFix({
- title: _t.html("issues.fix.set_as_" + role + ".title"),
+ 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
- }));
+ context.perform(
+ actionChangeMember(this.issue.entityIds[0], member, oldMember.index),
+ _t("operations.change_role.annotation", {
+ n: 1
+ })
+ );
}
});
}
- validation.type = type3;
+ validation.type = type2;
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;
+ var type2 = "missing_tag";
+ function hasDescriptiveTags(entity) {
+ var onlyAttributeKeys = ["description", "name", "note", "start_date", "oneway"];
+ var entityDescriptiveKeys = Object.keys(entity.tags).filter(function(k2) {
+ if (k2 === "area" || !osmIsInterestingTag(k2)) return false;
return !onlyAttributeKeys.some(function(attributeKey) {
- return k === attributeKey || k.indexOf(attributeKey + ":") === 0;
+ return k2 === attributeKey || k2.indexOf(attributeKey + ":") === 0;
});
});
if (entity.type === "relation" && entityDescriptiveKeys.length === 1 && entity.tags.type === "multipolygon") {
- return osmOldMultipolygonOuterMemberOfRelation(entity, graph);
+ return false;
}
return entityDescriptiveKeys.length > 0;
}
@@ -41636,10 +44804,12 @@ ${content}
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 (!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, graph)) {
+ } else if (!hasDescriptiveTags(entity)) {
subtype = "descriptive";
} else if (isUntypedRelation(entity)) {
subtype = "relation_type";
@@ -41648,19 +44818,18 @@ ${content}
if (!subtype && isUnknownRoad(entity)) {
subtype = "highway_classification";
}
- if (!subtype)
- return [];
+ 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,
+ type: type2,
subtype,
severity,
message: function(context2) {
var entity2 = context2.hasEntity(this.entityIds[0]);
- return entity2 ? _t.html("issues." + messageID + ".message", {
+ return entity2 ? _t.append("issues." + messageID + ".message", {
feature: utilDisplayLabel(entity2, context2.graph())
}) : "";
},
@@ -41671,30 +44840,32 @@ ${content}
var selectFixType = subtype === "highway_classification" ? "select_road_type" : "select_preset";
fixes.push(new validationIssueFix({
icon: "iD-icon-search",
- title: _t.html("issues.fix." + selectFixType + ".title"),
+ title: _t.append("issues.fix." + selectFixType + ".title"),
onClick: function(context3) {
context3.ui().sidebar.showPresetList();
}
}));
var deleteOnClick;
var id2 = this.entityIds[0];
- var operation = operationDelete(context2, [id2]);
- var disabledReasonID = operation.disabled();
+ var operation2 = operationDelete(context2, [id2]);
+ var disabledReasonID = operation2.disabled();
if (!disabledReasonID) {
deleteOnClick = function(context3) {
var id3 = this.issue.entityIds[0];
- var operation2 = operationDelete(context3, [id3]);
- if (!operation2.disabled()) {
- operation2();
+ var operation3 = operationDelete(context3, [id3]);
+ if (!operation3.disabled()) {
+ operation3();
}
};
}
- fixes.push(new validationIssueFix({
- icon: "iD-operation-delete",
- title: _t.html("issues.fix.delete_feature.title"),
- disabledReason: disabledReasonID ? _t("operations.delete." + disabledReasonID + ".single") : void 0,
- onClick: deleteOnClick
- }));
+ 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;
}
})];
@@ -41702,49 +44873,134 @@ ${content}
selection2.selectAll(".issue-reference").data([0]).enter().append("div").attr("class", "issue-reference").call(_t.append("issues." + referenceID + ".reference"));
}
};
- validation.type = type3;
+ validation.type = type2;
+ return validation;
+ }
+
+ // 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 })
+ );
+ }
+ });
+ }
+ 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;
+ };
+ validation.type = type2;
return validation;
}
// modules/validations/outdated_tags.js
function validationOutdatedTags() {
- const type3 = "outdated_tags";
+ const type2 = "outdated_tags";
let _waitingForDeprecated = true;
let _dataDeprecated;
- _mainFileFetcher.get("deprecated").then((d) => _dataDeprecated = d).catch(() => {
+ _mainFileFetcher.get("deprecated").then((d2) => _dataDeprecated = d2).catch(() => {
}).finally(() => _waitingForDeprecated = false);
function oldTagIssues(entity, graph) {
- const oldTags = Object.assign({}, entity.tags);
+ 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)
- return [];
- if (!entity.hasInterestingTags())
- return [];
if (preset.replacement) {
const newPreset = _mainPresetIndex.item(preset.replacement);
- graph = actionChangePreset(entity.id, preset, newPreset, true)(graph);
+ 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((tag) => {
- graph = actionUpgradeTags(entity.id, tag.old, tag.replace)(graph);
+ 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);
}
}
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";
- } else {
- newTags[k] = preset.addTags[k];
- }
+ 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
+ });
}
});
}
@@ -41759,15 +45015,18 @@ ${content}
if (nsiResult) {
newTags = nsiResult.newTags;
subtype = "noncanonical_brand";
+ upgradeReasons.push({
+ source: "name-suggestion-index",
+ data: nsiResult
+ });
}
}
}
let issues = [];
issues.provisional = _waitingForDeprecated || waitingForNsi;
const tagDiff = utilTagDiff(oldTags, newTags);
- if (!tagDiff.length)
- return issues;
- const isOnlyAddingTags = tagDiff.every((d) => d.type === "+");
+ if (!tagDiff.length) return issues;
+ const isOnlyAddingTags = tagDiff.every((d2) => d2.type === "+");
let prefix = "";
if (nsiResult) {
prefix = "noncanonical_brand.";
@@ -41777,7 +45036,7 @@ ${content}
}
let autoArgs = subtype !== "noncanonical_brand" ? [doUpgrade, _t("issues.fix.upgrade_tags.annotation")] : null;
issues.push(new validationIssue({
- type: type3,
+ type: type2,
subtype,
severity: "warning",
message: showMessage,
@@ -41788,7 +45047,7 @@ ${content}
let fixes = [
new validationIssueFix({
autoArgs,
- title: _t.html("issues.fix.upgrade_tags.title"),
+ title: _t.append("issues.fix.upgrade_tags.title"),
onClick: (context) => {
context.perform(doUpgrade, _t("issues.fix.upgrade_tags.annotation"));
}
@@ -41796,12 +45055,14 @@ ${content}
];
const item = nsiResult && nsiResult.matched;
if (item) {
- fixes.push(new validationIssueFix({
- title: _t.html("issues.fix.tag_as_not.title", { name: item.displayName }),
- onClick: (context) => {
- context.perform(addNotTag, _t("issues.fix.tag_as_not.annotation"));
- }
- }));
+ 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"));
+ }
+ })
+ );
}
return fixes;
}
@@ -41809,8 +45070,7 @@ ${content}
return issues;
function doUpgrade(graph2) {
const currEntity = graph2.hasEntity(entity.id);
- if (!currEntity)
- return graph2;
+ if (!currEntity) return graph2;
let newTags2 = Object.assign({}, currEntity.tags);
tagDiff.forEach((diff) => {
if (diff.type === "-") {
@@ -41823,14 +45083,12 @@ ${content}
}
function addNotTag(graph2) {
const currEntity = graph2.hasEntity(entity.id);
- if (!currEntity)
- return graph2;
+ if (!currEntity) return graph2;
const item = nsiResult && nsiResult.matched;
- if (!item)
- return graph2;
+ if (!item) return graph2;
let newTags2 = Object.assign({}, currEntity.tags);
const wd = item.mainTag;
- const notwd = `not:${wd}`;
+ const notwd = "not:".concat(wd);
const qid = item.tags[wd];
newTags2[notwd] = qid;
if (newTags2[wd] === qid) {
@@ -41842,90 +45100,38 @@ ${content}
}
function showMessage(context) {
const currEntity = context.hasEntity(entity.id);
- if (!currEntity)
- return "";
- let messageID = `issues.outdated_tags.${prefix}message`;
+ if (!currEntity) return "";
+ let messageID = "issues.outdated_tags.".concat(prefix, "message");
if (subtype === "noncanonical_brand" && isOnlyAddingTags) {
messageID += "_incomplete";
}
- return _t.html(messageID, {
- feature: utilDisplayLabel(currEntity, context.graph(), true)
+ 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.${prefix}reference`));
+ 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", (d) => {
- let klass = d.type === "+" ? "add" : "remove";
- return `tagDiff-cell tagDiff-cell-${klass}`;
- }).html((d) => d.display);
- }
- }
- 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;
- } else {
- return [];
- }
- 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.html("issues.fix.move_tags.title"),
- onClick: (context) => {
- context.perform(doUpgrade, _t("issues.fix.move_tags.annotation"));
- }
- })
- ];
- }
- })];
- 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.html("issues.old_multipolygon.message", { multipolygon: utilDisplayLabel(currMultipolygon, context.graph(), true) });
- }
- function showReference(selection2) {
- selection2.selectAll(".issue-reference").data([0]).enter().append("div").attr("class", "issue-reference").call(_t.append("issues.old_multipolygon.reference"));
+ 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 = function checkOutdatedTags(entity, graph) {
- let issues = oldMultipolygonIssues(entity, graph);
- if (!issues.length)
- issues = oldTagIssues(entity, graph);
- return issues;
- };
- validation.type = type3;
+ let validation = oldTagIssues;
+ validation.type = type2;
return validation;
}
// modules/validations/private_data.js
function validationPrivateData() {
- var type3 = "private_data";
+ var type2 = "private_data";
var privateBuildingValues = {
detached: true,
farm: true,
@@ -41954,22 +45160,19 @@ ${content}
};
var validation = function checkPrivateData(entity) {
var tags = entity.tags;
- if (!tags.building || !privateBuildingValues[tags.building])
- return [];
+ 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];
+ for (var k2 in tags) {
+ if (publicKeys[k2]) return [];
+ if (!personalTags[k2]) {
+ keepTags[k2] = tags[k2];
}
}
var tagDiff = utilTagDiff(tags, keepTags);
- if (!tagDiff.length)
- return [];
+ if (!tagDiff.length) return [];
var fixID = tagDiff.length === 1 ? "remove_tag" : "remove_tags";
return [new validationIssue({
- type: type3,
+ type: type2,
severity: "warning",
message: showMessage,
reference: showReference,
@@ -41978,9 +45181,9 @@ ${content}
return [
new validationIssueFix({
icon: "iD-operation-delete",
- title: _t.html("issues.fix." + fixID + ".title"),
+ title: _t.append("issues.fix." + fixID + ".title"),
onClick: function(context) {
- context.perform(doUpgrade, _t("issues.fix.upgrade_tags.annotation"));
+ context.perform(doUpgrade, _t("issues.fix.remove_tag.annotation"));
}
})
];
@@ -41988,8 +45191,7 @@ ${content}
})];
function doUpgrade(graph) {
var currEntity = graph.hasEntity(entity.id);
- if (!currEntity)
- return graph;
+ if (!currEntity) return graph;
var newTags = Object.assign({}, currEntity.tags);
tagDiff.forEach(function(diff) {
if (diff.type === "-") {
@@ -42002,29 +45204,31 @@ ${content}
}
function showMessage(context) {
var currEntity = context.hasEntity(this.entityIds[0]);
- if (!currEntity)
- return "";
- return _t.html("issues.private_data.contact.message", { feature: utilDisplayLabel(currEntity, context.graph()) });
+ if (!currEntity) return "";
+ return _t.append(
+ "issues.private_data.contact.message",
+ { feature: utilDisplayLabel(currEntity, context.graph()) }
+ );
}
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";
+ 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(d) {
- return d.display;
+ }).html(function(d2) {
+ return d2.display;
});
}
};
- validation.type = type3;
+ validation.type = type2;
return validation;
}
// modules/validations/suspicious_name.js
function validationSuspiciousName() {
- const type3 = "suspicious_name";
+ const type2 = "suspicious_name";
const keysToTestForGenericValues = [
"aerialway",
"aeroway",
@@ -42052,8 +45256,8 @@ ${content}
return false;
}
function nameMatchesRawTag(lowercaseName, tags) {
- for (let i2 = 0; i2 < keysToTestForGenericValues.length; i2++) {
- let key = keysToTestForGenericValues[i2];
+ for (let i3 = 0; i3 < keysToTestForGenericValues.length; i3++) {
+ let key = keysToTestForGenericValues[i3];
let val = tags[key];
if (val) {
val = val.toLowerCase();
@@ -42064,73 +45268,42 @@ ${content}
}
return false;
}
- function isGenericName(name2, tags) {
- name2 = name2.toLowerCase();
- return nameMatchesRawTag(name2, tags) || isGenericMatchInNsi(tags);
+ function isGenericName(name, tags) {
+ name = name.toLowerCase();
+ return nameMatchesRawTag(name, tags) || isGenericMatchInNsi(tags);
}
function makeGenericNameIssue(entityId, nameKey, genericName, langCode) {
return new validationIssue({
- type: type3,
+ type: type2,
subtype: "generic_name",
severity: "warning",
message: function(context) {
let entity = context.hasEntity(this.entityIds[0]);
- if (!entity)
- return "";
+ if (!entity) return "";
let preset = _mainPresetIndex.match(entity, context.graph());
let langName = langCode && _mainLocalizer.languageName(langCode);
- return _t.html("issues.generic_name.message" + (langName ? "_language" : ""), { feature: preset.name(), name: genericName, language: langName });
+ return _t.append(
+ "issues.generic_name.message" + (langName ? "_language" : ""),
+ { feature: preset.name(), name: genericName, language: langName }
+ );
},
reference: showReference,
entityIds: [entityId],
- hash: `${nameKey}=${genericName}`,
+ hash: "".concat(nameKey, "=").concat(genericName),
dynamicFixes: function() {
return [
new validationIssueFix({
icon: "iD-operation-delete",
- title: _t.html("issues.fix.remove_the_name.title"),
+ 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"));
- }
- }
- function makeIncorrectNameIssue(entityId, nameKey, incorrectName, langCode) {
- return new validationIssue({
- type: type3,
- subtype: "not_name",
- 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.html("issues.incorrect_name.message" + (langName ? "_language" : ""), { feature: preset.name(), name: incorrectName, language: langName });
- },
- reference: showReference,
- entityIds: [entityId],
- hash: `${nameKey}=${incorrectName}`,
- dynamicFixes: function() {
- return [
- new validationIssueFix({
- icon: "iD-operation-delete",
- title: _t.html("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"));
+ context.perform(
+ actionChangeTags(entityId2, tags),
+ _t("issues.fix.remove_generic_name.annotation")
+ );
}
})
];
@@ -42143,25 +45316,13 @@ ${content}
let validation = function checkGenericName(entity) {
const tags = entity.tags;
const hasWikidata = !!tags.wikidata || !!tags["brand:wikidata"] || !!tags["operator:wikidata"];
- if (hasWikidata)
- return [];
+ 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 m2 = key.match(/^name(?:(?::)([a-zA-Z_-]+))?$/);
+ if (!m2) continue;
+ const langCode = m2.length >= 2 ? m2[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;
- }
- }
- }
if (isGenericName(value, tags)) {
issues.provisional = _waitingForNsi;
issues.push(makeGenericNameIssue(entity.id, key, value, langCode));
@@ -42169,57 +45330,47 @@ ${content}
}
return issues;
};
- validation.type = type3;
+ validation.type = type2;
return validation;
}
// modules/validations/unsquare_way.js
function validationUnsquareWay(context) {
- var type3 = "unsquare_way";
+ 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;
+ 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 [];
+ if (!isBuilding(entity, graph)) return [];
+ if (entity.tags.nonsquare === "yes") return [];
var isClosed = entity.isClosed();
- if (!isClosed)
- return [];
+ if (!isClosed) return [];
var nodes = graph.childNodes(entity).slice();
- if (nodes.length > nodeThreshold + 1)
- return [];
+ if (nodes.length > nodeThreshold + 1) return [];
var osm = services.osm;
if (!osm || nodes.some(function(node) {
return !osm.isDataLoaded(node.loc);
- }))
- return [];
+ })) 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;
+ 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 [];
+ if (hasConnectedSquarableWays) return [];
var storedDegreeThreshold = corePreferences("validate-square-degrees");
- var degreeThreshold = isNaN(storedDegreeThreshold) ? DEFAULT_DEG_THRESHOLD : parseFloat(storedDegreeThreshold);
+ 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 [];
+ if (!geoOrthoCanOrthogonalize(points, isClosed, epsilon3, degreeThreshold, true)) return [];
var autoArgs;
if (!entity.tags.wikidata) {
var autoAction = actionOrthogonalize(entity.id, context.projection, void 0, degreeThreshold);
@@ -42227,12 +45378,12 @@ ${content}
autoArgs = [autoAction, _t("operations.orthogonalize.annotation.feature", { n: 1 })];
}
return [new validationIssue({
- type: type3,
+ type: type2,
subtype: "building",
severity: "warning",
message: function(context2) {
var entity2 = context2.hasEntity(this.entityIds[0]);
- return entity2 ? _t.html("issues.unsquare_way.message", {
+ return entity2 ? _t.append("issues.unsquare_way.message", {
feature: utilDisplayLabel(entity2, context2.graph())
}) : "";
},
@@ -42243,16 +45394,34 @@ ${content}
return [
new validationIssueFix({
icon: "iD-operation-orthogonalize",
- title: _t.html("issues.fix.square_feature.title"),
+ 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 }));
+ context2.perform(
+ actionOrthogonalize(entityId, context2.projection, void 0, degreeThreshold),
+ _t("operations.orthogonalize.annotation.feature", { n: 1 })
+ );
window.setTimeout(function() {
completionHandler();
}, 175);
}
})
+ /*
+ new validationIssueFix({
+ title: t.append('issues.fix.tag_as_unsquare.title'),
+ onClick: function(context) {
+ var entityId = this.issue.entityIds[0];
+ var entity = context.entity(entityId);
+ var tags = Object.assign({}, entity.tags); // shallow copy
+ tags.nonsquare = 'yes';
+ context.perform(
+ actionChangeTags(entityId, tags),
+ t('issues.fix.tag_as_unsquare.annotation')
+ );
+ }
+ })
+ */
];
}
})];
@@ -42260,14 +45429,14 @@ ${content}
selection2.selectAll(".issue-reference").data([0]).enter().append("div").attr("class", "issue-reference").call(_t.append("issues.unsquare_way.buildings.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 dispatch14 = dispatch_default("validated", "focusedIssue");
+ let validator = utilRebind({}, dispatch14, "on");
let _rules = {};
let _disabledRules = {};
let _ignoredIssueIDs = /* @__PURE__ */ new Set();
@@ -42289,29 +45458,27 @@ ${content}
rules.forEach((rule) => {
rule = rule.trim();
const parts = rule.split("/", 2);
- const type3 = parts[0];
+ const type2 = parts[0];
const subtype = parts[1] || "*";
- if (!type3 || !subtype)
- return;
- result.push({ type: makeRegExp(type3), subtype: makeRegExp(subtype) });
+ if (!type2 || !subtype) return;
+ result.push({ type: makeRegExp(type2), subtype: makeRegExp(subtype) });
});
return result;
- function makeRegExp(str2) {
- const escaped = str2.replace(/[-\/\\^$+?.()|[\]{}]/g, "\\$&").replace(/\*/g, ".*");
+ function makeRegExp(str) {
+ const escaped = str.replace(/[-\/\\^$+?.()|[\]{}]/g, "\\$&").replace(/\*/g, ".*");
return new RegExp("^" + escaped + "$");
}
}
validator.init = () => {
Object.values(validations_exports).forEach((validation) => {
- if (typeof validation !== "function")
- return;
+ 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);
+ disabledRules.split(",").forEach((k2) => _disabledRules[k2] = true);
}
};
function reset(resetIgnored) {
@@ -42324,8 +45491,7 @@ ${content}
_deferredRIC = {};
_deferredST.forEach(window.clearTimeout);
_deferredST.clear();
- if (resetIgnored)
- _ignoredIssueIDs.clear();
+ if (resetIgnored) _ignoredIssueIDs.clear();
_resolvedIssueIDs.clear();
_baseCache = validationCache("base");
_headCache = validationCache("head");
@@ -42337,23 +45503,21 @@ ${content}
};
validator.resetIgnoredIssues = () => {
_ignoredIssueIDs.clear();
- dispatch10.call("validated");
+ dispatch14.call("validated");
};
validator.revalidateUnsquare = () => {
revalidateUnsquare(_headCache);
revalidateUnsquare(_baseCache);
- dispatch10.call("validated");
+ dispatch14.call("validated");
};
function revalidateUnsquare(cache) {
const checkUnsquareWay = _rules.unsquare_way;
- if (!cache.graph || typeof checkUnsquareWay !== "function")
- return;
+ 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;
+ if (!detected.length) return;
cache.cacheIssues(detected);
});
}
@@ -42365,44 +45529,32 @@ ${content}
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;
+ if (opts.what === "edited" && !userModified) return;
+ if (!filter2(issue)) return;
seen.add(issue.id);
results.push(issue);
});
}
if (opts.what === "all") {
Object.values(_baseCache.issuesByIssueID).forEach((issue) => {
- if (!filter2(issue))
- return;
+ if (!filter2(issue)) return;
seen.add(issue.id);
results.push(issue);
});
}
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 (!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))
- return false;
+ if (!view.intersects(extent)) return false;
}
return true;
}
@@ -42441,7 +45593,7 @@ ${content}
if (selectID) {
window.setTimeout(() => {
context.enter(modeSelect(context, [selectID]));
- dispatch10.call("focusedIssue", this, issue);
+ dispatch14.call("focusedIssue", this, issue);
}, 250);
}
};
@@ -42453,14 +45605,19 @@ ${content}
};
validator.getSharedEntityIssues = (entityIDs, options2) => {
const orderedIssueTypes = [
+ // Show some issue types in a particular order:
"missing_tag",
"missing_role",
+ // - missing data first
"outdated_tags",
"mismatched_geometry",
+ // - identity issues
"crossing_ways",
"almost_junction",
+ // - geometry issues where fixing them might solve connectivity issues
"disconnected_way",
"impossible_oneway"
+ // - finally connectivity issues
];
const allIssues = validator.getIssues(options2);
const forEntityIDs = new Set(entityIDs);
@@ -42497,9 +45654,9 @@ ${content}
corePreferences("validate-disabledRules", Object.keys(_disabledRules).join(","));
validator.validate();
};
- validator.disableRules = (keys) => {
+ validator.disableRules = (keys2) => {
_disabledRules = {};
- keys.forEach((k) => _disabledRules[k] = true);
+ keys2.forEach((k2) => _disabledRules[k2] = true);
corePreferences("validate-disabledRules", Object.keys(_disabledRules).join(","));
validator.validate();
};
@@ -42508,15 +45665,13 @@ ${content}
};
validator.validate = () => {
const baseGraph = context.history().base();
- if (!_headCache.graph)
- _headCache.graph = baseGraph;
- if (!_baseCache.graph)
- _baseCache.graph = baseGraph;
+ 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");
+ dispatch14.call("validated");
return Promise.resolve();
}
if (_headPromise) {
@@ -42529,10 +45684,10 @@ ${content}
let entityIDs = Object.keys(incrementalDiff.complete());
entityIDs = _headCache.withAllRelatedEntities(entityIDs);
if (!entityIDs.size) {
- dispatch10.call("validated");
+ dispatch14.call("validated");
return Promise.resolve();
}
- _headPromise = validateEntitiesAsync(entityIDs, _headCache).then(() => updateResolvedIssues(entityIDs)).then(() => dispatch10.call("validated")).catch(() => {
+ _headPromise = validateEntitiesAsync(entityIDs, _headCache).then(() => updateResolvedIssues(entityIDs)).then(() => dispatch14.call("validated")).catch(() => {
}).then(() => {
_headPromise = null;
if (!_headIsCurrent) {
@@ -42547,13 +45702,10 @@ ${content}
});
context.on("exit.validator", validator.validate);
context.history().on("merge.validator", (entities) => {
- if (!entities)
- return;
+ if (!entities) return;
const baseGraph = context.history().base();
- if (!_headCache.graph)
- _headCache.graph = baseGraph;
- if (!_baseCache.graph)
- _baseCache.graph = baseGraph;
+ 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);
@@ -42575,23 +45727,23 @@ ${content}
detected = detected.filter(applySeverityOverrides);
result.issues = result.issues.concat(detected);
function applySeverityOverrides(issue) {
- const type3 = issue.type;
+ const type2 = 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)) {
+ let i3;
+ for (i3 = 0; i3 < _errorOverrides.length; i3++) {
+ if (_errorOverrides[i3].type.test(type2) && _errorOverrides[i3].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)) {
+ for (i3 = 0; i3 < _warningOverrides.length; i3++) {
+ if (_warningOverrides[i3].type.test(type2) && _warningOverrides[i3].subtype.test(subtype)) {
issue.severity = "warning";
return true;
}
}
- for (i2 = 0; i2 < _disableOverrides.length; i2++) {
- if (_disableOverrides[i2].type.test(type3) && _disableOverrides[i2].subtype.test(subtype)) {
+ for (i3 = 0; i3 < _disableOverrides.length; i3++) {
+ if (_disableOverrides[i3].type.test(type2) && _disableOverrides[i3].subtype.test(subtype)) {
return false;
}
}
@@ -42602,8 +45754,7 @@ ${content}
function updateResolvedIssues(entityIDs) {
entityIDs.forEach((entityID) => {
const baseIssues = _baseCache.issuesByEntityID[entityID];
- if (!baseIssues)
- return;
+ if (!baseIssues) return;
baseIssues.forEach((issueID) => {
const issue = _baseCache.issuesByIssueID[issueID];
const userModified = (issue.entityIds || []).some((id2) => _completeDiff.hasOwnProperty(id2));
@@ -42617,18 +45768,15 @@ ${content}
}
function validateEntitiesAsync(entityIDs, cache) {
const jobs = Array.from(entityIDs).map((entityID) => {
- if (cache.queuedEntityIDs.has(entityID))
- return null;
+ 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;
+ if (!graph) return;
const entity = graph.hasEntity(entityID);
- if (!entity)
- return;
+ if (!entity) return;
const result = validateEntity(entity, graph);
if (result.provisional) {
cache.provisionalEntityIDs.add(entityID);
@@ -42637,26 +45785,22 @@ ${content}
};
}).filter(Boolean);
cache.queue = cache.queue.concat(utilArrayChunk(jobs, 100));
- if (cache.queuePromise)
- return cache.queuePromise;
+ if (cache.queuePromise) return cache.queuePromise;
cache.queuePromise = processQueue(cache).then(() => revalidateProvisionalEntities(cache)).catch(() => {
}).finally(() => cache.queuePromise = null);
return cache.queuePromise;
}
function revalidateProvisionalEntities(cache) {
- if (!cache.provisionalEntityIDs.size)
- return;
+ if (!cache.provisionalEntityIDs.size) return;
const handle = window.setTimeout(() => {
_deferredST.delete(handle);
- if (!cache.provisionalEntityIDs.size)
- return;
+ if (!cache.provisionalEntityIDs.size) return;
validateEntitiesAsync(Array.from(cache.provisionalEntityIDs), cache);
}, RETRY);
_deferredST.add(handle);
}
function processQueue(cache) {
- if (!cache.queue.length)
- return Promise.resolve();
+ if (!cache.queue.length) return Promise.resolve();
const chunk = cache.queue.pop();
return new Promise((resolvePromise, rejectPromise) => {
const handle = window.requestIdleCallback(() => {
@@ -42666,8 +45810,7 @@ ${content}
});
_deferredRIC[handle] = rejectPromise;
}).then(() => {
- if (cache.queue.length % 25 === 0)
- dispatch10.call("validated");
+ if (cache.queue.length % 25 === 0) dispatch14.call("validated");
}).then(() => processQueue(cache));
}
return validator;
@@ -42681,7 +45824,9 @@ ${content}
queuedEntityIDs: /* @__PURE__ */ new Set(),
provisionalEntityIDs: /* @__PURE__ */ new Set(),
issuesByIssueID: {},
+ // issue.id -> issue
issuesByEntityID: {}
+ // entity.id -> Set(issue.id)
};
cache.cacheIssue = (issue) => {
(issue.entityIds || []).forEach((entityID) => {
@@ -42706,8 +45851,8 @@ ${content}
cache.uncacheIssues = (issues) => {
issues.forEach(cache.uncacheIssue);
};
- cache.uncacheIssuesOfType = (type3) => {
- const issuesOfType = Object.values(cache.issuesByIssueID).filter((issue) => issue.type === type3);
+ cache.uncacheIssuesOfType = (type2) => {
+ const issuesOfType = Object.values(cache.issuesByIssueID).filter((issue) => issue.type === type2);
cache.uncacheIssues(issuesOfType);
};
cache.uncacheEntityID = (entityID) => {
@@ -42748,17 +45893,35 @@ ${content}
// modules/core/uploader.js
function coreUploader(context) {
- var dispatch10 = dispatch_default("saveStarted", "saveEnded", "willAttemptUpload", "progressChanged", "resultNoChanges", "resultErrors", "resultConflicts", "resultSuccess");
+ var dispatch14 = dispatch_default(
+ // Start and end events are dispatched exactly once each per legitimate outside call to `save`
+ "saveStarted",
+ // dispatched as soon as a call to `save` has been deemed legitimate
+ "saveEnded",
+ // dispatched after the result event has been dispatched
+ "willAttemptUpload",
+ // dispatched before the actual upload call occurs, if it will
+ "progressChanged",
+ // Each save results in one of these outcomes:
+ "resultNoChanges",
+ // upload wasn't attempted since there were no edits
+ "resultErrors",
+ // upload failed due to errors
+ "resultConflicts",
+ // upload failed due to data conflicts
+ "resultSuccess"
+ // upload completed without errors
+ );
var _isSaving = false;
var _conflicts = [];
var _errors = [];
var _origChanges;
var _discardTags = {};
- _mainFileFetcher.get("discarded").then(function(d) {
- _discardTags = d;
+ _mainFileFetcher.get("discarded").then(function(d2) {
+ _discardTags = d2;
}).catch(function() {
});
- var uploader = utilRebind({}, dispatch10, "on");
+ var uploader = utilRebind({}, dispatch14, "on");
uploader.isSaving = function() {
return _isSaving;
};
@@ -42767,8 +45930,7 @@ ${content}
return;
}
var osm = context.connection();
- if (!osm)
- return;
+ if (!osm) return;
if (!osm.authenticated()) {
osm.authenticate(function(err) {
if (!err) {
@@ -42779,7 +45941,7 @@ ${content}
}
if (!_isSaving) {
_isSaving = true;
- dispatch10.call("saveStarted", this);
+ dispatch14.call("saveStarted", this);
}
var history = context.history();
_conflicts = [];
@@ -42796,15 +45958,14 @@ ${content}
};
function performFullConflictCheck(changeset) {
var osm = context.connection();
- if (!osm)
- return;
+ 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];
+ for (var i3 = 0; i3 < summary.length; i3++) {
+ var item = summary[i3];
if (item.changeType === "modified") {
_toCheck.push(item.entity.id);
}
@@ -42814,7 +45975,7 @@ ${content}
var _toLoadCount = 0;
var _toLoadTotal = _toLoad.length;
if (_toCheck.length) {
- dispatch10.call("progressChanged", this, _toLoadCount, _toLoadTotal);
+ dispatch14.call("progressChanged", this, _toLoadCount, _toLoadTotal);
_toLoad.forEach(function(id2) {
_loaded[id2] = false;
});
@@ -42824,22 +45985,20 @@ ${content}
}
return;
function withChildNodes(ids, graph) {
- var s = new Set(ids);
+ var s2 = new Set(ids);
ids.forEach(function(id2) {
var entity = graph.entity(id2);
- if (entity.type !== "way")
- return;
+ if (entity.type !== "way") return;
graph.childNodes(entity).forEach(function(child) {
if (child.version !== void 0) {
- s.add(child.id);
+ s2.add(child.id);
}
});
});
- return Array.from(s);
+ return Array.from(s2);
}
function loaded(err, result) {
- if (_errors.length)
- return;
+ if (_errors.length) return;
if (err) {
_errors.push({
msg: err.message || err.responseText,
@@ -42854,20 +46013,19 @@ ${content}
_toLoad = _toLoad.filter(function(val) {
return val !== entity.id;
});
- if (!entity.visible)
- return;
- var i3, id2;
+ if (!entity.visible) return;
+ var i4, id2;
if (entity.type === "way") {
- for (i3 = 0; i3 < entity.nodes.length; i3++) {
- id2 = entity.nodes[i3];
+ for (i4 = 0; i4 < entity.nodes.length; i4++) {
+ id2 = entity.nodes[i4];
if (_loaded[id2] === void 0) {
_loaded[id2] = false;
loadMore.push(id2);
}
}
} else if (entity.type === "relation" && entity.isMultipolygon()) {
- for (i3 = 0; i3 < entity.members.length; i3++) {
- id2 = entity.members[i3].id;
+ for (i4 = 0; i4 < entity.members.length; i4++) {
+ id2 = entity.members[i4].id;
if (_loaded[id2] === void 0) {
_loaded[id2] = false;
loadMore.push(id2);
@@ -42877,7 +46035,7 @@ ${content}
});
_toLoadCount += result.data.length;
_toLoadTotal += loadMore.length;
- dispatch10.call("progressChanged", this, _toLoadCount, _toLoadTotal);
+ dispatch14.call("progressChanged", this, _toLoadCount, _toLoadTotal);
if (loadMore.length) {
_toLoad.push.apply(_toLoad, loadMore);
osm.loadMultiple(loadMore, loaded);
@@ -42889,31 +46047,29 @@ ${content}
}
}
function detectConflicts() {
- function choice(id2, text2, action) {
+ function choice(id2, text, action) {
return {
id: id2,
- text: text2,
+ text,
action: function() {
history.replace(action);
}
};
}
- function formatUser(d) {
- return '' + escape_default(d) + "";
+ function formatUser(d2) {
+ return '' + escape_default(d2) + "";
}
function entityName(entity) {
return utilDisplayName(entity) || utilDisplayType(entity.id) + " " + entity.id;
}
function sameVersions(local, remote) {
- if (local.version !== remote.version)
- return false;
+ 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;
+ for (var i4 = 0; i4 < children2.length; i4++) {
+ var a2 = localGraph.hasEntity(children2[i4]);
+ var b2 = remoteGraph.hasEntity(children2[i4]);
+ if (a2 && b2 && a2.version !== b2.version) return false;
}
}
return true;
@@ -42921,13 +46077,11 @@ ${content}
_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;
+ if (sameVersions(local, remote)) return;
+ var merge2 = actionMergeRemoteChanges(id2, localGraph, remoteGraph, _discardTags, formatUser);
+ history.replace(merge2);
+ var mergeConflicts = merge2.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"));
@@ -42958,1549 +46112,2224 @@ ${content}
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);
+ dispatch14.call("willAttemptUpload", this);
osm.putChangeset(changeset, changes, uploadCallback);
} else {
didResultInNoChanges();
}
}
}
- function uploadCallback(err, changeset) {
- if (err) {
- if (err.status === 409) {
- uploader.save(changeset, true, true);
+ 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();
+ }
+ } else {
+ didResultInSuccess(changeset);
+ }
+ }
+ function didResultInNoChanges() {
+ dispatch14.call("resultNoChanges", this);
+ endSave();
+ context.flush();
+ }
+ function didResultInErrors() {
+ context.history().pop();
+ dispatch14.call("resultErrors", this, _errors);
+ endSave();
+ }
+ function didResultInConflicts(changeset) {
+ _conflicts.sort(function(a2, b2) {
+ return b2.id.localeCompare(a2.id);
+ });
+ dispatch14.call("resultConflicts", this, changeset, _conflicts, _origChanges);
+ endSave();
+ }
+ function didResultInSuccess(changeset) {
+ context.history().clearSaved();
+ dispatch14.call("resultSuccess", this, changeset);
+ window.setTimeout(function() {
+ endSave();
+ context.flush();
+ }, 2500);
+ }
+ function endSave() {
+ _isSaving = false;
+ dispatch14.call("saveEnded", this);
+ }
+ uploader.cancelConflictResolution = function() {
+ context.history().pop();
+ };
+ uploader.processResolvedConflicts = function(changeset) {
+ var history = context.history();
+ for (var i3 = 0; i3 < _conflicts.length; i3++) {
+ if (_conflicts[i3].chosen === 1) {
+ var entity = context.hasEntity(_conflicts[i3].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[i3].id));
+ }
+ }
+ uploader.save(changeset, true, false);
+ };
+ uploader.reset = function() {
+ };
+ return uploader;
+ }
+
+ // 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"))();
+ });
+ 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;
+ }
+
+ // 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);
+ function defaultTags(loc) {
+ var defaultTags2 = { area: "yes" };
+ if (mode.preset) defaultTags2 = mode.preset.setTags(defaultTags2, "area", false, loc);
+ return defaultTags2;
+ }
+ 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(loc) });
+ context.perform(
+ actionAddEntity(node),
+ actionAddEntity(way),
+ actionAddVertex(way.id, node.id),
+ actionClose(way.id)
+ );
+ context.enter(modeDrawArea(context, way.id, startGraph, mode.button));
+ }
+ function startFromWay(loc, edge) {
+ var startGraph = context.graph();
+ var node = osmNode({ loc });
+ var way = osmWay({ tags: defaultTags(loc) });
+ 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 startFromNode(node) {
+ var startGraph = context.graph();
+ var way = osmWay({ tags: defaultTags(node.loc) });
+ context.perform(
+ actionAddEntity(way),
+ actionAddVertex(way.id, node.id),
+ actionClose(way.id)
+ );
+ context.enter(modeDrawArea(context, way.id, startGraph, mode.button));
+ }
+ mode.enter = function() {
+ context.install(behavior);
+ };
+ mode.exit = function() {
+ context.uninstall(behavior);
+ };
+ return mode;
+ }
+
+ // 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);
+ function defaultTags(loc) {
+ var defaultTags2 = {};
+ if (mode.preset) defaultTags2 = mode.preset.setTags(defaultTags2, "line", false, loc);
+ return defaultTags2;
+ }
+ function start2(loc) {
+ var startGraph = context.graph();
+ var node = osmNode({ loc });
+ var way = osmWay({ tags: defaultTags(loc) });
+ context.perform(
+ actionAddEntity(node),
+ actionAddEntity(way),
+ actionAddVertex(way.id, node.id)
+ );
+ context.enter(modeDrawLine(context, way.id, startGraph, mode.button));
+ }
+ function startFromWay(loc, edge) {
+ var startGraph = context.graph();
+ var node = osmNode({ loc });
+ var way = osmWay({ tags: defaultTags(loc) });
+ 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 startFromNode(node) {
+ var startGraph = context.graph();
+ var way = osmWay({ tags: defaultTags(node.loc) });
+ context.perform(
+ actionAddEntity(way),
+ actionAddVertex(way.id, node.id)
+ );
+ context.enter(modeDrawLine(context, way.id, startGraph, mode.button));
+ }
+ mode.enter = function() {
+ context.install(behavior);
+ };
+ mode.exit = function() {
+ context.uninstall(behavior);
+ };
+ return mode;
+ }
+
+ // 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);
+ function defaultTags(loc) {
+ var defaultTags2 = {};
+ if (mode.preset) defaultTags2 = mode.preset.setTags(defaultTags2, "point", false, loc);
+ return defaultTags2;
+ }
+ function add(loc) {
+ var node = osmNode({ loc, tags: defaultTags(loc) });
+ context.perform(
+ actionAddEntity(node),
+ _t("operations.add.annotation.point")
+ );
+ enterSelectMode(node);
+ }
+ function addWay(loc, edge) {
+ var node = osmNode({ tags: defaultTags(loc) });
+ context.perform(
+ actionAddMidpoint({ loc, edge }, node),
+ _t("operations.add.annotation.vertex")
+ );
+ enterSelectMode(node);
+ }
+ function enterSelectMode(node) {
+ context.enter(
+ modeSelect(context, [node.id]).newFeature(true)
+ );
+ }
+ function addNode(node) {
+ const _defaultTags = defaultTags(node.loc);
+ if (Object.keys(_defaultTags).length === 0) {
+ enterSelectMode(node);
+ return;
+ }
+ var tags = Object.assign({}, node.tags);
+ for (var key in _defaultTags) {
+ tags[key] = _defaultTags[key];
+ }
+ context.perform(
+ actionChangeTags(node.id, tags),
+ _t("operations.add.annotation.point")
+ );
+ enterSelectMode(node);
+ }
+ function cancel() {
+ context.enter(modeBrowse(context));
+ }
+ mode.enter = function() {
+ context.install(behavior);
+ };
+ mode.exit = function() {
+ context.uninstall(behavior);
+ };
+ return mode;
+ }
+
+ // modules/ui/note_comments.js
+ function uiNoteComments() {
+ var _note;
+ function noteComments(selection2) {
+ if (_note.isNew()) return;
+ var comments = selection2.selectAll(".comments-container").data([0]);
+ comments = comments.enter().append("div").attr("class", "comments-container").merge(comments);
+ var commentEnter = comments.selectAll(".comment").data(_note.comments).enter().append("div").attr("class", "comment");
+ commentEnter.append("div").attr("class", function(d2) {
+ return "comment-avatar user-" + d2.uid;
+ }).call(svgIcon("#iD-icon-avatar", "comment-avatar-icon"));
+ var mainEnter = commentEnter.append("div").attr("class", "comment-main");
+ var metadataEnter = mainEnter.append("div").attr("class", "comment-metadata");
+ metadataEnter.append("div").attr("class", "comment-author").each(function(d2) {
+ var selection3 = select_default2(this);
+ var osm = services.osm;
+ if (osm && d2.user) {
+ selection3 = selection3.append("a").attr("class", "comment-author-link").attr("href", osm.userURL(d2.user)).attr("target", "_blank");
+ }
+ if (d2.user) {
+ selection3.text(d2.user);
+ } else {
+ selection3.call(_t.append("note.anonymous"));
+ }
+ });
+ metadataEnter.append("div").attr("class", "comment-date").html(function(d2) {
+ return _t.html("note.status." + d2.action, { when: localeDateString2(d2.date) });
+ });
+ mainEnter.append("div").attr("class", "comment-text").html(function(d2) {
+ return d2.html;
+ }).selectAll("a").attr("rel", "noopener nofollow").attr("target", "_blank");
+ comments.call(replaceAvatars);
+ }
+ function replaceAvatars(selection2) {
+ var showThirdPartyIcons = corePreferences("preferences.privacy.thirdpartyicons") || "true";
+ var osm = services.osm;
+ if (showThirdPartyIcons !== "true" || !osm) return;
+ var uids = {};
+ _note.comments.forEach(function(d2) {
+ if (d2.uid) uids[d2.uid] = true;
+ });
+ Object.keys(uids).forEach(function(uid) {
+ osm.loadUser(uid, function(err, user) {
+ if (!user || !user.image_url) return;
+ selection2.selectAll(".comment-avatar.user-" + uid).html("").append("img").attr("class", "icon comment-avatar-icon").attr("src", user.image_url).attr("alt", user.display_name);
+ });
+ });
+ }
+ function localeDateString2(s2) {
+ if (!s2) return null;
+ var options2 = { day: "numeric", month: "short", year: "numeric" };
+ s2 = s2.replace(/-/g, "/");
+ var d2 = new Date(s2);
+ if (isNaN(d2.getTime())) return null;
+ return d2.toLocaleDateString(_mainLocalizer.localeCode(), options2);
+ }
+ noteComments.note = function(val) {
+ if (!arguments.length) return _note;
+ _note = val;
+ return noteComments;
+ };
+ return noteComments;
+ }
+
+ // modules/ui/note_header.js
+ function uiNoteHeader() {
+ var _note;
+ function noteHeader(selection2) {
+ var header = selection2.selectAll(".note-header").data(
+ _note ? [_note] : [],
+ function(d2) {
+ return d2.status + d2.id;
+ }
+ );
+ header.exit().remove();
+ var headerEnter = header.enter().append("div").attr("class", "note-header");
+ var iconEnter = headerEnter.append("div").attr("class", function(d2) {
+ return "note-header-icon " + d2.status;
+ }).classed("new", function(d2) {
+ return d2.id < 0;
+ });
+ iconEnter.append("div").attr("class", "preset-icon-28").call(svgIcon("#iD-icon-note", "note-fill"));
+ iconEnter.each(function(d2) {
+ var statusIcon;
+ if (d2.id < 0) {
+ statusIcon = "#iD-icon-plus";
+ } else if (d2.status === "open") {
+ statusIcon = "#iD-icon-close";
+ } else {
+ statusIcon = "#iD-icon-apply";
+ }
+ iconEnter.append("div").attr("class", "note-icon-annotation").attr("title", _t("icons.close")).call(svgIcon(statusIcon, "icon-annotation"));
+ });
+ headerEnter.append("div").attr("class", "note-header-label").html(function(d2) {
+ if (_note.isNew()) {
+ return _t.html("note.new");
+ }
+ return _t.html("note.note") + " " + d2.id + " " + (d2.status === "closed" ? _t.html("note.closed") : "");
+ });
+ }
+ noteHeader.note = function(val) {
+ if (!arguments.length) return _note;
+ _note = val;
+ return noteHeader;
+ };
+ return noteHeader;
+ }
+
+ // modules/ui/note_report.js
+ function uiNoteReport() {
+ var _note;
+ function noteReport(selection2) {
+ var url;
+ if (services.osm && _note instanceof osmNote && !_note.isNew()) {
+ url = services.osm.noteReportURL(_note);
+ }
+ var link3 = selection2.selectAll(".note-report").data(url ? [url] : []);
+ link3.exit().remove();
+ var linkEnter = link3.enter().append("a").attr("class", "note-report").attr("target", "_blank").attr("href", function(d2) {
+ return d2;
+ }).call(svgIcon("#iD-icon-out-link", "inline"));
+ linkEnter.append("span").call(_t.append("note.report"));
+ }
+ noteReport.note = function(val) {
+ if (!arguments.length) return _note;
+ _note = val;
+ return noteReport;
+ };
+ return noteReport;
+ }
+
+ // modules/ui/view_on_osm.js
+ function uiViewOnOSM(context) {
+ var _what;
+ function viewOnOSM(selection2) {
+ var url;
+ if (_what instanceof osmEntity) {
+ url = context.connection().entityURL(_what);
+ } else if (_what instanceof osmNote) {
+ url = context.connection().noteURL(_what);
+ }
+ var data = !_what || _what.isNew() ? [] : [_what];
+ var link3 = selection2.selectAll(".view-on-osm").data(data, function(d2) {
+ return d2.id;
+ });
+ link3.exit().remove();
+ var linkEnter = link3.enter().append("a").attr("class", "view-on-osm").attr("target", "_blank").attr("href", url).call(svgIcon("#iD-icon-out-link", "inline"));
+ linkEnter.append("span").call(_t.append("inspector.view_on_osm"));
+ }
+ viewOnOSM.what = function(_2) {
+ if (!arguments.length) return _what;
+ _what = _2;
+ return viewOnOSM;
+ };
+ return viewOnOSM;
+ }
+
+ // modules/ui/note_editor.js
+ function uiNoteEditor(context) {
+ var dispatch14 = dispatch_default("change");
+ var noteComments = uiNoteComments(context);
+ var noteHeader = uiNoteHeader();
+ var _note;
+ var _newNote;
+ function noteEditor(selection2) {
+ var header = selection2.selectAll(".header").data([0]);
+ var headerEnter = header.enter().append("div").attr("class", "header fillL");
+ headerEnter.append("button").attr("class", "close").attr("title", _t("icons.close")).on("click", function() {
+ context.enter(modeBrowse(context));
+ }).call(svgIcon("#iD-icon-close"));
+ headerEnter.append("h2").call(_t.append("note.title"));
+ var body = selection2.selectAll(".body").data([0]);
+ body = body.enter().append("div").attr("class", "body").merge(body);
+ var editor = body.selectAll(".note-editor").data([0]);
+ editor.enter().append("div").attr("class", "modal-section note-editor").merge(editor).call(noteHeader.note(_note)).call(noteComments.note(_note)).call(noteSaveSection);
+ var footer = selection2.selectAll(".footer").data([0]);
+ footer.enter().append("div").attr("class", "footer").merge(footer).call(uiViewOnOSM(context).what(_note)).call(uiNoteReport(context).note(_note));
+ var osm = services.osm;
+ if (osm) {
+ osm.on("change.note-save", function() {
+ selection2.call(noteEditor);
+ });
+ }
+ }
+ function noteSaveSection(selection2) {
+ var isSelected = _note && _note.id === context.selectedNoteID();
+ var noteSave = selection2.selectAll(".note-save").data(isSelected ? [_note] : [], function(d2) {
+ return d2.status + d2.id;
+ });
+ noteSave.exit().remove();
+ var noteSaveEnter = noteSave.enter().append("div").attr("class", "note-save save-section cf");
+ noteSaveEnter.append("h4").attr("class", ".note-save-header").text("").each(function() {
+ if (_note.isNew()) {
+ _t.append("note.newDescription")(select_default2(this));
} else {
- _errors.push({
- msg: err.message || err.responseText,
- details: [_t("save.status_code", { code: err.status })]
- });
- didResultInErrors();
+ _t.append("note.newComment")(select_default2(this));
}
- } else {
- didResultInSuccess(changeset);
- }
- }
- function didResultInNoChanges() {
- dispatch10.call("resultNoChanges", this);
- endSave();
- context.flush();
- }
- function didResultInErrors() {
- context.history().pop();
- dispatch10.call("resultErrors", this, _errors);
- endSave();
- }
- function didResultInConflicts(changeset) {
- _conflicts.sort(function(a, b) {
- return b.id.localeCompare(a.id);
});
- 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);
- }
- 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]));
- }
+ var commentTextarea = noteSaveEnter.append("textarea").attr("class", "new-comment-input").attr("placeholder", _t("note.inputPlaceholder")).attr("maxlength", 1e3).property("value", function(d2) {
+ return d2.newComment;
+ }).call(utilNoAuto).on("keydown.note-input", keydown).on("input.note-input", changeInput).on("blur.note-input", changeInput);
+ if (!commentTextarea.empty() && _newNote) {
+ commentTextarea.node().focus();
+ }
+ noteSave = noteSaveEnter.merge(noteSave).call(userDetails).call(noteSaveButtons);
+ function keydown(d3_event) {
+ if (!(d3_event.keyCode === 13 && // â© Return
+ d3_event.metaKey)) return;
+ var osm = services.osm;
+ if (!osm) return;
+ var hasAuth = osm.authenticated();
+ if (!hasAuth) return;
+ if (!_note.newComment) return;
+ d3_event.preventDefault();
+ select_default2(this).on("keydown.note-input", null);
+ window.setTimeout(function() {
+ if (_note.isNew()) {
+ noteSave.selectAll(".save-button").node().focus();
+ clickSave(_note);
+ } else {
+ noteSave.selectAll(".comment-button").node().focus();
+ clickComment(_note);
}
- history.replace(actionRevert(_conflicts[i2].id));
+ }, 10);
+ }
+ function changeInput() {
+ var input = select_default2(this);
+ var val = input.property("value").trim() || void 0;
+ _note = _note.update({ newComment: val });
+ var osm = services.osm;
+ if (osm) {
+ osm.replaceNote(_note);
}
+ noteSave.call(noteSaveButtons);
}
- uploader.save(changeset, true, false);
- };
- uploader.reset = function() {
- };
- return uploader;
- }
-
- // 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));
}
- clear() {
- this.pendingHandles.forEach((timeoutHandle) => {
- clearTimeout(timeoutHandle);
+ function userDetails(selection2) {
+ var detailSection = selection2.selectAll(".detail-section").data([0]);
+ detailSection = detailSection.enter().append("div").attr("class", "detail-section").merge(detailSection);
+ var osm = services.osm;
+ if (!osm) return;
+ var hasAuth = osm.authenticated();
+ var authWarning = detailSection.selectAll(".auth-warning").data(hasAuth ? [] : [0]);
+ authWarning.exit().transition().duration(200).style("opacity", 0).remove();
+ var authEnter = authWarning.enter().insert("div", ".tag-reference-body").attr("class", "field-warning auth-warning").style("opacity", 0);
+ authEnter.call(svgIcon("#iD-icon-alert", "inline"));
+ authEnter.append("span").call(_t.append("note.login"));
+ authEnter.append("a").attr("target", "_blank").call(svgIcon("#iD-icon-out-link", "inline")).append("span").call(_t.append("login")).on("click.note-login", function(d3_event) {
+ d3_event.preventDefault();
+ osm.authenticate();
+ });
+ authEnter.transition().duration(200).style("opacity", 1);
+ var prose = detailSection.selectAll(".note-save-prose").data(hasAuth ? [0] : []);
+ prose.exit().remove();
+ prose = prose.enter().append("p").attr("class", "note-save-prose").call(_t.append("note.upload_explanation")).merge(prose);
+ osm.userDetails(function(err, user) {
+ if (err) return;
+ var userLink = select_default2(document.createElement("div"));
+ if (user.image_url) {
+ userLink.append("img").attr("src", user.image_url).attr("class", "icon pre-text user-icon");
+ }
+ userLink.append("a").attr("class", "user-info").text(user.display_name).attr("href", osm.userURL(user.display_name)).attr("target", "_blank");
+ prose.html(_t.html("note.upload_explanation_with_user", { user: { html: userLink.html() } }));
});
- 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 || "?");
+ function noteSaveButtons(selection2) {
+ var osm = services.osm;
+ var hasAuth = osm && osm.authenticated();
+ var isSelected = _note && _note.id === context.selectedNoteID();
+ var buttonSection = selection2.selectAll(".buttons").data(isSelected ? [_note] : [], function(d2) {
+ return d2.status + d2.id;
+ });
+ buttonSection.exit().remove();
+ var buttonEnter = buttonSection.enter().append("div").attr("class", "buttons");
+ if (_note.isNew()) {
+ buttonEnter.append("button").attr("class", "button cancel-button secondary-action").call(_t.append("confirm.cancel"));
+ buttonEnter.append("button").attr("class", "button save-button action").call(_t.append("note.save"));
+ } else {
+ buttonEnter.append("button").attr("class", "button status-button action");
+ buttonEnter.append("button").attr("class", "button comment-button action").call(_t.append("note.comment"));
+ }
+ buttonSection = buttonSection.merge(buttonEnter);
+ buttonSection.select(".cancel-button").on("click.cancel", clickCancel);
+ buttonSection.select(".save-button").attr("disabled", isSaveDisabled).on("click.save", clickSave);
+ buttonSection.select(".status-button").attr("disabled", hasAuth ? null : true).each(function(d2) {
+ var action = d2.status === "open" ? "close" : "open";
+ var andComment = d2.newComment ? "_comment" : "";
+ _t.addOrUpdate("note." + action + andComment)(select_default2(this));
+ }).on("click.status", clickStatus);
+ buttonSection.select(".comment-button").attr("disabled", isSaveDisabled).on("click.comment", clickComment);
+ function isSaveDisabled(d2) {
+ return hasAuth && d2.status === "open" && d2.newComment ? null : true;
}
}
- 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, "");
- return _t("imagery." + id_safe + ".name", { default: (0, import_lodash2.escape)(_name) });
- };
- source.label = function() {
- var id_safe = source.id.replace(/\./g, "");
- return _t.html("imagery." + id_safe + ".name", { default: (0, import_lodash2.escape)(_name) });
- };
- source.description = function() {
- var id_safe = source.id.replace(/\./g, "");
- return _t.html("imagery." + id_safe + ".description", { default: (0, import_lodash2.escape)(_description) });
- };
- source.best = function() {
- return _best;
- };
- source.area = function() {
- if (!data.polygon)
- return Number.MAX_VALUE;
- var area = area_default({ type: "MultiPolygon", coordinates: [data.polygon] });
- return isNaN(area) ? 0 : area;
- };
- source.imageryUsed = function() {
- return _name || source.id;
- };
- source.template = function(val) {
- if (!arguments.length)
- return _template;
- if (source.id === "custom" || source.id === "Bing") {
- _template = val;
+ function clickCancel(d3_event, d2) {
+ this.blur();
+ var osm = services.osm;
+ if (osm) {
+ osm.removeNote(d2);
}
- return source;
- };
- source.url = function(coord2) {
- var result = _template.replace(/#.*/su, "");
- if (result === "")
- return result;
- if (!source.type || source.id === "custom") {
- if (/SERVICE=WMS|\{(proj|wkid|bbox)\}/.test(result)) {
- source.type = "wms";
- source.projection = "EPSG:3857";
- } else if (/\{(x|y)\}/.test(result)) {
- source.type = "tms";
- } else if (/\{u\}/.test(result)) {
- source.type = "bing";
- }
+ context.enter(modeBrowse(context));
+ dispatch14.call("change");
+ }
+ function clickSave(d3_event, d2) {
+ this.blur();
+ var osm = services.osm;
+ if (osm) {
+ osm.postNoteCreate(d2, function(err, note) {
+ dispatch14.call("change", note);
+ });
}
- if (source.type === "wms") {
- var tileToProjectedCoords = function(x, y, z) {
- var zoomSize = Math.pow(2, z);
- var lon = x / zoomSize * Math.PI * 2 - Math.PI;
- var lat = Math.atan(Math.sinh(Math.PI * (1 - 2 * y / zoomSize)));
- switch (source.projection) {
- case "EPSG:4326":
- return {
- x: lon * 180 / Math.PI,
- y: lat * 180 / Math.PI
- };
- default:
- var mercCoords = mercatorRaw(lon, lat);
- return {
- x: 2003750834e-2 / Math.PI * mercCoords[0],
- y: 2003750834e-2 / Math.PI * mercCoords[1]
- };
- }
- };
- var tileSize = source.tileSize;
- var projection2 = source.projection;
- var minXmaxY = tileToProjectedCoords(coord2[0], coord2[1], coord2[2]);
- var maxXminY = tileToProjectedCoords(coord2[0] + 1, coord2[1] + 1, coord2[2]);
- result = result.replace(/\{(\w+)\}/g, function(token, key) {
- switch (key) {
- case "width":
- case "height":
- return tileSize;
- case "proj":
- return projection2;
- case "wkid":
- return projection2.replace(/^EPSG:/, "");
- case "bbox":
- if (projection2 === "EPSG:4326" && /VERSION=1.3|CRS={proj}/.test(source.template().toUpperCase())) {
- return maxXminY.y + "," + minXmaxY.x + "," + minXmaxY.y + "," + maxXminY.x;
- } else {
- return minXmaxY.x + "," + maxXminY.y + "," + maxXminY.x + "," + minXmaxY.y;
- }
- case "w":
- return minXmaxY.x;
- case "s":
- return maxXminY.y;
- case "n":
- return maxXminY.x;
- case "e":
- return minXmaxY.y;
- default:
- return token;
- }
+ }
+ function clickStatus(d3_event, d2) {
+ this.blur();
+ var osm = services.osm;
+ if (osm) {
+ var setStatus = d2.status === "open" ? "closed" : "open";
+ osm.postNoteUpdate(d2, setStatus, function(err, note) {
+ dispatch14.call("change", note);
});
- } else if (source.type === "tms") {
- result = result.replace("{x}", coord2[0]).replace("{y}", coord2[1]).replace(/\{[t-]y\}/, Math.pow(2, coord2[2]) - coord2[1] - 1).replace(/\{z(oom)?\}/, coord2[2]).replace(/\{@2x\}|\{r\}/, isRetina ? "@2x" : "");
- } else if (source.type === "bing") {
- result = result.replace("{u}", function() {
- var u = "";
- for (var zoom = coord2[2]; zoom > 0; zoom--) {
- var b = 0;
- var mask = 1 << zoom - 1;
- if ((coord2[0] & mask) !== 0)
- b++;
- if ((coord2[1] & mask) !== 0)
- b += 2;
- u += b.toString();
- }
- return u;
+ }
+ }
+ function clickComment(d3_event, d2) {
+ this.blur();
+ var osm = services.osm;
+ if (osm) {
+ osm.postNoteUpdate(d2, d2.status, function(err, note) {
+ dispatch14.call("change", note);
});
}
- result = result.replace(/\{switch:([^}]+)\}/, function(s, r) {
- var subdomains = r.split(",");
- return subdomains[(coord2[0] + coord2[1]) % subdomains.length];
- });
- return result;
- };
- source.validZoom = function(z) {
- return source.zoomExtent[0] <= z && (source.overzoom || source.zoomExtent[1] > z);
- };
- source.isLocatorOverlay = function() {
- return source.id === "mapbox_locator_overlay";
- };
- source.isHidden = function() {
- return source.id === "DigitalGlobe-Premium-vintage" || source.id === "DigitalGlobe-Standard-vintage";
- };
- source.copyrightNotices = function() {
+ }
+ noteEditor.note = function(val) {
+ if (!arguments.length) return _note;
+ _note = val;
+ return noteEditor;
};
- source.getMetadata = function(center, tileCoord, callback) {
- var vintage = {
- start: localeDateString(source.startDate),
- end: localeDateString(source.endDate)
- };
- vintage.range = vintageRange(vintage);
- var metadata = { vintage };
- callback(null, metadata);
+ noteEditor.newNote = function(val) {
+ if (!arguments.length) return _newNote;
+ _newNote = val;
+ return noteEditor;
};
- return source;
+ return utilRebind(noteEditor, dispatch14, "on");
}
- rendererBackgroundSource.Bing = function(data, dispatch10) {
- data.template = "https://ecn.t{switch:0,1,2,3}.tiles.virtualearth.net/tiles/a{u}.jpeg?g=1&pr=odbl&n=z";
- var bing = rendererBackgroundSource(data);
- var key = utilAesDecrypt("5c875730b09c6b422433e807e1ff060b6536c791dbfffcffc4c6b18a1bdba1f14593d151adb50e19e1be1ab19aef813bf135d0f103475e5c724dec94389e45d0");
- const strictParam = "n";
- var url = "https://dev.virtualearth.net/REST/v1/Imagery/Metadata/AerialOSM?include=ImageryProviders&uriScheme=https&key=" + key;
- var cache = {};
- var inflight = {};
- var providers = [];
- var taskQueue = new IntervalTasksQueue(250);
- var metadataLastZoom = -1;
- json_default(url).then(function(json) {
- let imageryResource = json.resourceSets[0].resources[0];
- let template = imageryResource.imageUrl;
- let subDomains = imageryResource.imageUrlSubdomains;
- let subDomainNumbers = subDomains.map((subDomain) => {
- return subDomain.substring(1);
- }).join(",");
- template = template.replace("{subdomain}", `t{switch:${subDomainNumbers}}`).replace("{quadkey}", "{u}");
- if (!new URLSearchParams(template).has(strictParam)) {
- template += `&${strictParam}=z`;
- }
- bing.template(template);
- providers = imageryResource.imageryProviders.map(function(provider) {
- return {
- attribution: provider.attribution,
- areas: provider.coverageAreas.map(function(area) {
- return {
- zoom: [area.zoomMin, area.zoomMax],
- extent: geoExtent([area.bbox[1], area.bbox[0]], [area.bbox[3], area.bbox[2]])
- };
- })
- };
- });
- dispatch10.call("change");
- }).catch(function() {
- });
- bing.copyrightNotices = function(zoom, extent) {
- zoom = Math.min(zoom, 21);
- return providers.filter(function(provider) {
- return provider.areas.some(function(area) {
- return extent.intersects(area.extent) && area.zoom[0] <= zoom && area.zoom[1] >= zoom;
- });
- }).map(function(provider) {
- return provider.attribution;
- }).join(", ");
+
+ // modules/modes/select_note.js
+ function modeSelectNote(context, selectedNoteID) {
+ var mode = {
+ id: "select-note",
+ button: "browse"
};
- bing.getMetadata = function(center, tileCoord, callback) {
- var tileID = tileCoord.slice(0, 3).join("/");
- var zoom = Math.min(tileCoord[2], 21);
- var centerPoint = center[1] + "," + center[0];
- var url2 = "https://dev.virtualearth.net/REST/v1/Imagery/BasicMetadata/AerialOSM/" + centerPoint + "?zl=" + zoom + "&key=" + key;
- if (inflight[tileID])
- return;
- if (!cache[tileID]) {
- cache[tileID] = {};
- }
- if (cache[tileID] && cache[tileID].metadata) {
- return callback(null, cache[tileID].metadata);
- }
- inflight[tileID] = true;
- if (metadataLastZoom !== tileCoord[2]) {
- metadataLastZoom = tileCoord[2];
- taskQueue.clear();
+ 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));
}
- taskQueue.enqueue(() => {
- json_default(url2).then(function(result) {
- delete inflight[tileID];
- if (!result) {
- throw new Error("Unknown Error");
- }
- var vintage = {
- start: localeDateString(result.resourceSets[0].resources[0].vintageStart),
- end: localeDateString(result.resourceSets[0].resources[0].vintageEnd)
- };
- vintage.range = vintageRange(vintage);
- var metadata = { vintage };
- cache[tileID].metadata = metadata;
- if (callback)
- callback(null, metadata);
- }).catch(function(err) {
- delete inflight[tileID];
- if (callback)
- callback(err.message);
- });
- });
- };
- bing.terms_url = "https://blog.openstreetmap.org/2010/11/30/microsoft-imagery-details";
- return bing;
- };
- rendererBackgroundSource.Esri = function(data) {
- if (data.template.match(/blankTile/) === null) {
- data.template = data.template + "?blankTile=false";
+ return note;
}
- var esri = rendererBackgroundSource(data);
- var cache = {};
- var inflight = {};
- var _prevCenter;
- esri.fetchTilemap = function(center) {
- if (_prevCenter && geoSphericalDistance(center, _prevCenter) < 5e3)
- return;
- _prevCenter = center;
- var z = 20;
- var dummyUrl = esri.url([1, 2, 3]);
- var x = Math.floor((center[0] + 180) / 360 * Math.pow(2, z));
- var y = Math.floor((1 - Math.log(Math.tan(center[1] * Math.PI / 180) + 1 / Math.cos(center[1] * Math.PI / 180)) / Math.PI) / 2 * Math.pow(2, z));
- var tilemapUrl = dummyUrl.replace(/tile\/[0-9]+\/[0-9]+\/[0-9]+\?blankTile=false/, "tilemap") + "/" + z + "/" + y + "/" + x + "/8/8";
- json_default(tilemapUrl).then(function(tilemap) {
- if (!tilemap) {
- throw new Error("Unknown Error");
- }
- var hasTiles = true;
- for (var i2 = 0; i2 < tilemap.data.length; i2++) {
- if (!tilemap.data[i2]) {
- hasTiles = false;
- break;
- }
- }
- esri.zoomExtent[1] = hasTiles ? 22 : 19;
- }).catch(function() {
- });
- };
- esri.getMetadata = function(center, tileCoord, callback) {
- if (esri.id !== "EsriWorldImagery") {
- return callback(null, {});
- }
- var tileID = tileCoord.slice(0, 3).join("/");
- var zoom = Math.min(tileCoord[2], esri.zoomExtent[1]);
- var centerPoint = center[0] + "," + center[1];
- var unknown = _t("info_panels.background.unknown");
- var vintage = {};
- var metadata = {};
- if (inflight[tileID])
- return;
- var url = "https://services.arcgisonline.com/arcgis/rest/services/World_Imagery/MapServer/4/query";
- url += "?returnGeometry=false&geometry=" + centerPoint + "&inSR=4326&geometryType=esriGeometryPoint&outFields=*&f=json";
- if (!cache[tileID]) {
- cache[tileID] = {};
- }
- if (cache[tileID] && cache[tileID].metadata) {
- return callback(null, cache[tileID].metadata);
- }
- inflight[tileID] = true;
- json_default(url).then(function(result) {
- delete inflight[tileID];
- result = result.features.map((f2) => f2.attributes).filter((a) => a.MinMapLevel <= zoom && a.MaxMapLevel >= zoom)[0];
- if (!result) {
- throw new Error("Unknown Error");
- } else if (result.features && result.features.length < 1) {
- throw new Error("No Results");
- } else if (result.error && result.error.message) {
- throw new Error(result.error.message);
- }
- var captureDate = localeDateString(result.SRC_DATE2);
- vintage = {
- start: captureDate,
- end: captureDate,
- range: captureDate
- };
- metadata = {
- vintage,
- source: clean2(result.NICE_NAME),
- description: clean2(result.NICE_DESC),
- resolution: clean2(+parseFloat(result.SRC_RES).toFixed(4)),
- accuracy: clean2(+parseFloat(result.SRC_ACC).toFixed(4))
- };
- if (isFinite(metadata.resolution)) {
- metadata.resolution += " m";
- }
- if (isFinite(metadata.accuracy)) {
- metadata.accuracy += " m";
- }
- cache[tileID].metadata = metadata;
- if (callback)
- callback(null, metadata);
- }).catch(function(err) {
- delete inflight[tileID];
- if (callback)
- callback(err.message);
- });
- function clean2(val) {
- return String(val).trim() || unknown;
+ 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));
+ }
+ } else {
+ selection2.classed("selected", true);
+ context.selectedNoteID(selectedNoteID);
+ }
+ }
+ 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);
}
};
- return esri;
- };
- rendererBackgroundSource.None = function() {
- var source = rendererBackgroundSource({ id: "none", template: "" });
- source.name = function() {
- return _t("background.none");
+ mode.newFeature = function(val) {
+ if (!arguments.length) return _newFeature;
+ _newFeature = val;
+ return mode;
};
- source.label = function() {
- return _t.html("background.none");
+ 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);
};
- source.imageryUsed = function() {
- return null;
+ 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);
};
- source.area = function() {
- return -1;
+ return mode;
+ }
+
+ // 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")
};
- return source;
- };
- rendererBackgroundSource.Custom = function(template) {
- var source = rendererBackgroundSource({ id: "custom", template });
- source.name = function() {
- return _t("background.custom");
+ 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));
+ }
+ function cancel() {
+ context.enter(modeBrowse(context));
+ }
+ mode.enter = function() {
+ context.install(behavior);
};
- source.label = function() {
- return _t.html("background.custom");
+ mode.exit = function() {
+ context.uninstall(behavior);
};
- source.imageryUsed = function() {
- var cleaned = source.template();
- if (cleaned.indexOf("?") !== -1) {
- var parts = cleaned.split("?", 2);
- var qs = utilStringQs(parts[1]);
- ["access_token", "connectId", "token"].forEach(function(param) {
- if (qs[param]) {
- qs[param] = "{apikey}";
- }
- });
- cleaned = parts[0] + "?" + utilQsString(qs, true);
+ return mode;
+ }
+
+ // modules/util/jxon.js
+ var JXON = new function() {
+ var sValueProp = "keyValue", sAttributesProp = "keyAttributes", sAttrPref = "@", aCache = [], rIsNull = /^\s*$/, rIsBool = /^(?:true|false)$/i;
+ function parseText(sValue) {
+ if (rIsNull.test(sValue)) {
+ return null;
}
- cleaned = cleaned.replace(/token\/(\w+)/, "token/{apikey}").replace(/key=(\w+)/, "key={apikey}");
- return "Custom (" + cleaned + " )";
+ if (rIsBool.test(sValue)) {
+ return sValue.toLowerCase() === "true";
+ }
+ if (isFinite(sValue)) {
+ return parseFloat(sValue);
+ }
+ if (isFinite(Date.parse(sValue))) {
+ return new Date(sValue);
+ }
+ return sValue;
+ }
+ function EmptyTree() {
+ }
+ EmptyTree.prototype.toString = function() {
+ return "null";
};
- source.area = function() {
- return -2;
+ EmptyTree.prototype.valueOf = function() {
+ return null;
};
- return source;
- };
-
- // modules/renderer/background.js
- var import_which_polygon4 = __toESM(require_which_polygon());
-
- // modules/renderer/tile_layer.js
- function rendererTileLayer(context) {
- var transformProp = utilPrefixCSSProperty("Transform");
- var tiler8 = utilTiler();
- var _tileSize = 256;
- var _projection;
- var _cache4 = {};
- var _tileOrigin;
- var _zoom;
- var _source;
- function tileSizeAtZoom(d, z) {
- var EPSILON = 2e-3;
- return _tileSize * Math.pow(2, z - d[2]) / _tileSize + EPSILON;
- }
- function atZoom(t, distance) {
- var power = Math.pow(2, distance);
- return [
- Math.floor(t[0] * power),
- Math.floor(t[1] * power),
- t[2] + distance
- ];
+ function objectify(vValue) {
+ return vValue === null ? new EmptyTree() : vValue instanceof Object ? vValue : new vValue.constructor(vValue);
}
- function lookUp(d) {
- for (var up = -1; up > -d[2]; up--) {
- var tile = atZoom(d, up);
- if (_cache4[_source.url(tile)] !== false) {
- return tile;
+ function createObjTree(oParentNode, nVerb, bFreeze, bNesteAttr) {
+ var nLevelStart = aCache.length, bChildren = oParentNode.hasChildNodes(), bAttributes = oParentNode.hasAttributes(), bHighVerb = Boolean(nVerb & 2);
+ var sProp, vContent, nLength = 0, sCollectedTxt = "", vResult = bHighVerb ? {} : (
+ /* put here the default value for empty nodes: */
+ true
+ );
+ if (bChildren) {
+ for (var oNode, nItem = 0; nItem < oParentNode.childNodes.length; nItem++) {
+ oNode = oParentNode.childNodes.item(nItem);
+ if (oNode.nodeType === 4) {
+ sCollectedTxt += oNode.nodeValue;
+ } else if (oNode.nodeType === 3) {
+ sCollectedTxt += oNode.nodeValue.trim();
+ } else if (oNode.nodeType === 1 && !oNode.prefix) {
+ aCache.push(oNode);
+ }
}
}
- }
- function uniqueBy(a, n2) {
- var o = [];
- var seen = {};
- for (var i2 = 0; i2 < a.length; i2++) {
- if (seen[a[i2][n2]] === void 0) {
- o.push(a[i2]);
- seen[a[i2][n2]] = true;
- }
+ var nLevelEnd = aCache.length, vBuiltVal = parseText(sCollectedTxt);
+ if (!bHighVerb && (bChildren || bAttributes)) {
+ vResult = nVerb === 0 ? objectify(vBuiltVal) : {};
}
- return o;
- }
- function addSource(d) {
- d.push(_source.url(d));
- return d;
- }
- function background(selection2) {
- _zoom = geoScaleToZoom(_projection.scale(), _tileSize);
- var pixelOffset;
- if (_source) {
- pixelOffset = [
- _source.offset()[0] * Math.pow(2, _zoom),
- _source.offset()[1] * Math.pow(2, _zoom)
- ];
- } else {
- pixelOffset = [0, 0];
+ for (var nElId = nLevelStart; nElId < nLevelEnd; nElId++) {
+ sProp = aCache[nElId].nodeName.toLowerCase();
+ vContent = createObjTree(aCache[nElId], nVerb, bFreeze, bNesteAttr);
+ if (vResult.hasOwnProperty(sProp)) {
+ if (vResult[sProp].constructor !== Array) {
+ vResult[sProp] = [vResult[sProp]];
+ }
+ vResult[sProp].push(vContent);
+ } else {
+ vResult[sProp] = vContent;
+ nLength++;
+ }
}
- var translate = [
- _projection.translate()[0] + pixelOffset[0],
- _projection.translate()[1] + pixelOffset[1]
- ];
- tiler8.scale(_projection.scale() * 2 * Math.PI).translate(translate);
- _tileOrigin = [
- _projection.scale() * Math.PI - translate[0],
- _projection.scale() * Math.PI - translate[1]
- ];
- render(selection2);
- }
- function render(selection2) {
- if (!_source)
- return;
- var requests = [];
- var showDebug = context.getDebug("tile") && !_source.overlay;
- if (_source.validZoom(_zoom)) {
- tiler8.skipNullIsland(!!_source.overlay);
- tiler8().forEach(function(d) {
- addSource(d);
- if (d[3] === "")
- return;
- if (typeof d[3] !== "string")
- return;
- requests.push(d);
- if (_cache4[d[3]] === false && lookUp(d)) {
- requests.push(addSource(lookUp(d)));
+ if (bAttributes) {
+ var nAttrLen = oParentNode.attributes.length, sAPrefix = bNesteAttr ? "" : sAttrPref, oAttrParent = bNesteAttr ? {} : vResult;
+ for (var oAttrib, nAttrib = 0; nAttrib < nAttrLen; nLength++, nAttrib++) {
+ oAttrib = oParentNode.attributes.item(nAttrib);
+ oAttrParent[sAPrefix + oAttrib.name.toLowerCase()] = parseText(oAttrib.value.trim());
+ }
+ if (bNesteAttr) {
+ if (bFreeze) {
+ Object.freeze(oAttrParent);
}
- });
- requests = uniqueBy(requests, 3).filter(function(r) {
- return _cache4[r[3]] !== false;
- });
+ vResult[sAttributesProp] = oAttrParent;
+ nLength -= nAttrLen - 1;
+ }
}
- function load(d3_event, d) {
- _cache4[d[3]] = true;
- select_default2(this).on("error", null).on("load", null).classed("tile-loaded", true);
- render(selection2);
+ if (nVerb === 3 || (nVerb === 2 || nVerb === 1 && nLength > 0) && sCollectedTxt) {
+ vResult[sValueProp] = vBuiltVal;
+ } else if (!bHighVerb && nLength === 0 && sCollectedTxt) {
+ vResult = vBuiltVal;
}
- function error(d3_event, d) {
- _cache4[d[3]] = false;
- select_default2(this).on("error", null).on("load", null).remove();
- render(selection2);
+ if (bFreeze && (bHighVerb || nLength > 0)) {
+ Object.freeze(vResult);
}
- function imageTransform(d) {
- var ts = _tileSize * Math.pow(2, _zoom - d[2]);
- var scale = tileSizeAtZoom(d, _zoom);
- return "translate(" + (d[0] * ts - _tileOrigin[0]) + "px," + (d[1] * ts - _tileOrigin[1]) + "px) scale(" + scale + "," + scale + ")";
+ aCache.length = nLevelStart;
+ return vResult;
+ }
+ function loadObjTree(oXMLDoc, oParentEl, oParentObj) {
+ var vValue, oChild;
+ if (oParentObj instanceof String || oParentObj instanceof Number || oParentObj instanceof Boolean) {
+ oParentEl.appendChild(oXMLDoc.createTextNode(oParentObj.toString()));
+ } else if (oParentObj.constructor === Date) {
+ oParentEl.appendChild(oXMLDoc.createTextNode(oParentObj.toGMTString()));
}
- function tileCenter(d) {
- var ts = _tileSize * Math.pow(2, _zoom - d[2]);
- return [
- d[0] * ts - _tileOrigin[0] + ts / 2,
- d[1] * ts - _tileOrigin[1] + ts / 2
- ];
+ for (var sName in oParentObj) {
+ vValue = oParentObj[sName];
+ if (isFinite(sName) || vValue instanceof Function) {
+ continue;
+ }
+ if (sName === sValueProp) {
+ if (vValue !== null && vValue !== true) {
+ oParentEl.appendChild(oXMLDoc.createTextNode(vValue.constructor === Date ? vValue.toGMTString() : String(vValue)));
+ }
+ } else if (sName === sAttributesProp) {
+ for (var sAttrib in vValue) {
+ oParentEl.setAttribute(sAttrib, vValue[sAttrib]);
+ }
+ } else if (sName.charAt(0) === sAttrPref) {
+ oParentEl.setAttribute(sName.slice(1), vValue);
+ } else if (vValue.constructor === Array) {
+ for (var nItem = 0; nItem < vValue.length; nItem++) {
+ oChild = oXMLDoc.createElement(sName);
+ loadObjTree(oXMLDoc, oChild, vValue[nItem]);
+ oParentEl.appendChild(oChild);
+ }
+ } else {
+ oChild = oXMLDoc.createElement(sName);
+ if (vValue instanceof Object) {
+ loadObjTree(oXMLDoc, oChild, vValue);
+ } else if (vValue !== null && vValue !== true) {
+ oChild.appendChild(oXMLDoc.createTextNode(vValue.toString()));
+ }
+ oParentEl.appendChild(oChild);
+ }
}
- function debugTransform(d) {
- var coord2 = tileCenter(d);
- return "translate(" + coord2[0] + "px," + coord2[1] + "px)";
+ }
+ this.build = function(oXMLParent, nVerbosity, bFreeze, bNesteAttributes) {
+ var _nVerb = arguments.length > 1 && typeof nVerbosity === "number" ? nVerbosity & 3 : (
+ /* put here the default verbosity level: */
+ 1
+ );
+ return createObjTree(oXMLParent, _nVerb, bFreeze || false, arguments.length > 3 ? bNesteAttributes : _nVerb === 3);
+ };
+ this.unbuild = function(oObjTree) {
+ var oNewDoc = document.implementation.createDocument("", "", null);
+ loadObjTree(oNewDoc, oNewDoc, oObjTree);
+ return oNewDoc;
+ };
+ this.stringify = function(oObjTree) {
+ return new XMLSerializer().serializeToString(JXON.unbuild(oObjTree));
+ };
+ }();
+
+ // modules/ui/conflicts.js
+ function uiConflicts(context) {
+ var dispatch14 = dispatch_default("cancel", "save");
+ var keybinding = utilKeybinding("conflicts");
+ var _origChanges;
+ var _conflictList;
+ var _shownConflictIndex;
+ function keybindingOn() {
+ select_default2(document).call(keybinding.on("\u238B", cancel, true));
+ }
+ function keybindingOff() {
+ select_default2(document).call(keybinding.unbind);
+ }
+ function tryAgain() {
+ keybindingOff();
+ dispatch14.call("save");
+ }
+ function cancel() {
+ keybindingOff();
+ dispatch14.call("cancel");
+ }
+ function conflicts(selection2) {
+ keybindingOn();
+ var headerEnter = selection2.selectAll(".header").data([0]).enter().append("div").attr("class", "header fillL");
+ headerEnter.append("button").attr("class", "fr").attr("title", _t("icons.close")).on("click", cancel).call(svgIcon("#iD-icon-close"));
+ headerEnter.append("h2").call(_t.append("save.conflict.header"));
+ var bodyEnter = selection2.selectAll(".body").data([0]).enter().append("div").attr("class", "body fillL");
+ var conflictsHelpEnter = bodyEnter.append("div").attr("class", "conflicts-help").call(_t.append("save.conflict.help"));
+ var changeset = new osmChangeset();
+ delete changeset.id;
+ var data = JXON.stringify(changeset.osmChangeJXON(_origChanges));
+ var blob = new Blob([data], { type: "text/xml;charset=utf-8;" });
+ var fileName = "changes.osc";
+ var linkEnter = conflictsHelpEnter.selectAll(".download-changes").append("a").attr("class", "download-changes");
+ linkEnter.attr("href", window.URL.createObjectURL(blob)).attr("download", fileName);
+ linkEnter.call(svgIcon("#iD-icon-load", "inline")).append("span").call(_t.append("save.conflict.download_changes"));
+ bodyEnter.append("div").attr("class", "conflict-container fillL3").call(showConflict, 0);
+ bodyEnter.append("div").attr("class", "conflicts-done").attr("opacity", 0).style("display", "none").call(_t.append("save.conflict.done"));
+ var buttonsEnter = bodyEnter.append("div").attr("class", "buttons col12 joined conflicts-buttons");
+ buttonsEnter.append("button").attr("disabled", _conflictList.length > 1).attr("class", "action conflicts-button col6").call(_t.append("save.title")).on("click.try_again", tryAgain);
+ buttonsEnter.append("button").attr("class", "secondary-action conflicts-button col6").call(_t.append("confirm.cancel")).on("click.cancel", cancel);
+ }
+ function showConflict(selection2, index) {
+ index = utilWrap(index, _conflictList.length);
+ _shownConflictIndex = index;
+ var parent = select_default2(selection2.node().parentNode);
+ if (index === _conflictList.length - 1) {
+ window.setTimeout(function() {
+ parent.select(".conflicts-button").attr("disabled", null);
+ parent.select(".conflicts-done").transition().attr("opacity", 1).style("display", "block");
+ }, 250);
}
- var dims = tiler8.size();
- var mapCenter = [dims[0] / 2, dims[1] / 2];
- var minDist = Math.max(dims[0], dims[1]);
- var nearCenter;
- requests.forEach(function(d) {
- var c = tileCenter(d);
- var dist = geoVecLength(c, mapCenter);
- if (dist < minDist) {
- minDist = dist;
- nearCenter = d;
- }
+ var conflict = selection2.selectAll(".conflict").data([_conflictList[index]]);
+ conflict.exit().remove();
+ var conflictEnter = conflict.enter().append("div").attr("class", "conflict");
+ conflictEnter.append("h4").attr("class", "conflict-count").call(_t.append("save.conflict.count", { num: index + 1, total: _conflictList.length }));
+ conflictEnter.append("a").attr("class", "conflict-description").attr("href", "#").text(function(d2) {
+ return d2.name;
+ }).on("click", function(d3_event, d2) {
+ d3_event.preventDefault();
+ zoomToEntity(d2.id);
});
- var image = selection2.selectAll("img").data(requests, function(d) {
- return d[3];
+ var details = conflictEnter.append("div").attr("class", "conflict-detail-container");
+ details.append("ul").attr("class", "conflict-detail-list").selectAll("li").data(function(d2) {
+ return d2.details || [];
+ }).enter().append("li").attr("class", "conflict-detail-item").html(function(d2) {
+ return d2;
});
- image.exit().style(transformProp, imageTransform).classed("tile-removing", true).classed("tile-center", false).each(function() {
- var tile = select_default2(this);
- window.setTimeout(function() {
- if (tile.classed("tile-removing")) {
- tile.remove();
- }
- }, 300);
+ details.append("div").attr("class", "conflict-choices").call(addChoices);
+ details.append("div").attr("class", "conflict-nav-buttons joined cf").selectAll("button").data(["previous", "next"]).enter().append("button").attr("class", "conflict-nav-button action col6").attr("disabled", function(d2, i3) {
+ return i3 === 0 && index === 0 || i3 === 1 && index === _conflictList.length - 1 || null;
+ }).on("click", function(d3_event, d2) {
+ d3_event.preventDefault();
+ var container = parent.selectAll(".conflict-container");
+ var sign2 = d2 === "previous" ? -1 : 1;
+ container.selectAll(".conflict").remove();
+ container.call(showConflict, index + sign2);
+ }).each(function(d2) {
+ _t.append("save.conflict." + d2)(select_default2(this));
+ });
+ }
+ function addChoices(selection2) {
+ var choices = selection2.append("ul").attr("class", "layer-list").selectAll("li").data(function(d2) {
+ return d2.choices || [];
});
- image.enter().append("img").attr("class", "tile").attr("alt", "").attr("draggable", "false").style("width", _tileSize + "px").style("height", _tileSize + "px").attr("src", function(d) {
- return d[3];
- }).on("error", error).on("load", load).merge(image).style(transformProp, imageTransform).classed("tile-debug", showDebug).classed("tile-removing", false).classed("tile-center", function(d) {
- return d === nearCenter;
+ var choicesEnter = choices.enter().append("li").attr("class", "layer");
+ var labelEnter = choicesEnter.append("label");
+ labelEnter.append("input").attr("type", "radio").attr("name", function(d2) {
+ return d2.id;
+ }).on("change", function(d3_event, d2) {
+ var ul = this.parentNode.parentNode.parentNode;
+ ul.__data__.chosen = d2.id;
+ choose(d3_event, ul, d2);
});
- var debug2 = selection2.selectAll(".tile-label-debug").data(showDebug ? requests : [], function(d) {
- return d[3];
+ labelEnter.append("span").text(function(d2) {
+ return d2.text;
});
- debug2.exit().remove();
- if (showDebug) {
- var debugEnter = debug2.enter().append("div").attr("class", "tile-label-debug");
- debugEnter.append("div").attr("class", "tile-label-debug-coord");
- debugEnter.append("div").attr("class", "tile-label-debug-vintage");
- debug2 = debug2.merge(debugEnter);
- debug2.style(transformProp, debugTransform);
- debug2.selectAll(".tile-label-debug-coord").text(function(d) {
- return d[2] + " / " + d[0] + " / " + d[1];
- });
- debug2.selectAll(".tile-label-debug-vintage").each(function(d) {
- var span = select_default2(this);
- var center = context.projection.invert(tileCenter(d));
- _source.getMetadata(center, d, function(err, result) {
- if (result && result.vintage && result.vintage.range) {
- span.text(result.vintage.range);
- } else {
- span.html(_t.html("info_panels.background.vintage") + ": " + _t.html("info_panels.background.unknown"));
- }
- });
- });
+ choicesEnter.merge(choices).each(function(d2) {
+ var ul = this.parentNode;
+ if (ul.__data__.chosen === d2.id) {
+ choose(null, ul, d2);
+ }
+ });
+ }
+ function choose(d3_event, ul, datum2) {
+ if (d3_event) d3_event.preventDefault();
+ select_default2(ul).selectAll("li").classed("active", function(d2) {
+ return d2 === datum2;
+ }).selectAll("input").property("checked", function(d2) {
+ return d2 === datum2;
+ });
+ var extent = geoExtent();
+ var entity;
+ entity = context.graph().hasEntity(datum2.id);
+ if (entity) extent._extend(entity.extent(context.graph()));
+ datum2.action();
+ entity = context.graph().hasEntity(datum2.id);
+ if (entity) extent._extend(entity.extent(context.graph()));
+ zoomToEntity(datum2.id, extent);
+ }
+ function zoomToEntity(id2, extent) {
+ context.surface().selectAll(".hover").classed("hover", false);
+ var entity = context.graph().hasEntity(id2);
+ if (entity) {
+ if (extent) {
+ context.map().trimmedExtent(extent);
+ } else {
+ context.map().zoomToEase(entity);
+ }
+ context.surface().selectAll(utilEntityOrMemberSelector([entity.id], context.graph())).classed("hover", true);
}
}
- background.projection = function(val) {
- if (!arguments.length)
- return _projection;
- _projection = val;
- return background;
+ conflicts.conflictList = function(_2) {
+ if (!arguments.length) return _conflictList;
+ _conflictList = _2;
+ return conflicts;
};
- background.dimensions = function(val) {
- if (!arguments.length)
- return tiler8.size();
- tiler8.size(val);
- return background;
+ conflicts.origChanges = function(_2) {
+ if (!arguments.length) return _origChanges;
+ _origChanges = _2;
+ return conflicts;
};
- background.source = function(val) {
- if (!arguments.length)
- return _source;
- _source = val;
- _tileSize = _source.tileSize;
- _cache4 = {};
- tiler8.tileSize(_source.tileSize).zoomExtent(_source.zoomExtent);
- return background;
+ conflicts.shownEntityIds = function() {
+ if (_conflictList && typeof _shownConflictIndex === "number") {
+ return [_conflictList[_shownConflictIndex].id];
+ }
+ return [];
};
- return background;
+ return utilRebind(conflicts, dispatch14, "on");
}
- // modules/renderer/background.js
- var _imageryIndex = null;
- function rendererBackground(context) {
- const dispatch10 = dispatch_default("change");
- const baseLayer = rendererTileLayer(context).projection(context.projection);
- let _checkedBlocklists = [];
- let _isValid = true;
- let _overlayLayers = [];
- let _brightness = 1;
- let _contrast = 1;
- let _saturation = 1;
- let _sharpness = 1;
- function ensureImageryIndex() {
- return _mainFileFetcher.get("imagery").then((sources) => {
- if (_imageryIndex)
- return _imageryIndex;
- _imageryIndex = {
- imagery: sources,
- features: {}
- };
- const features2 = sources.map((source) => {
- if (!source.polygon)
- return null;
- const rings = source.polygon.map((ring) => [ring]);
- const feature3 = {
- type: "Feature",
- properties: { id: source.id },
- geometry: { type: "MultiPolygon", coordinates: rings }
- };
- _imageryIndex.features[source.id] = feature3;
- return feature3;
- }).filter(Boolean);
- _imageryIndex.query = (0, import_which_polygon4.default)({ type: "FeatureCollection", features: features2 });
- _imageryIndex.backgrounds = sources.map((source) => {
- if (source.type === "bing") {
- return rendererBackgroundSource.Bing(source, dispatch10);
- } else if (/^EsriWorldImagery/.test(source.id)) {
- return rendererBackgroundSource.Esri(source);
- } else {
- return rendererBackgroundSource(source);
- }
- });
- _imageryIndex.backgrounds.unshift(rendererBackgroundSource.None());
- let template = corePreferences("background-custom-template") || "";
- const custom = rendererBackgroundSource.Custom(template);
- _imageryIndex.backgrounds.unshift(custom);
- return _imageryIndex;
- });
- }
- function background(selection2) {
- const currSource = baseLayer.source();
- if (context.map().zoom() > 18) {
- if (currSource && /^EsriWorldImagery/.test(currSource.id)) {
- const center = context.map().center();
- currSource.fetchTilemap(center);
- }
+ // modules/ui/confirm.js
+ function uiConfirm(selection2) {
+ var modalSelection = uiModal(selection2);
+ modalSelection.select(".modal").classed("modal-alert", true);
+ var section = modalSelection.select(".content");
+ section.append("div").attr("class", "modal-section header");
+ section.append("div").attr("class", "modal-section message-text");
+ var buttons = section.append("div").attr("class", "modal-section buttons cf");
+ modalSelection.okButton = function() {
+ buttons.append("button").attr("class", "button ok-button action").on("click.confirm", function() {
+ modalSelection.remove();
+ }).call(_t.append("confirm.okay")).node().focus();
+ return modalSelection;
+ };
+ return modalSelection;
+ }
+
+ // modules/ui/commit.js
+ var import_fast_deep_equal10 = __toESM(require_fast_deep_equal());
+
+ // modules/ui/popover.js
+ var _popoverID = 0;
+ function uiPopover(klass) {
+ var _id = _popoverID++;
+ var _anchorSelection = select_default2(null);
+ var popover = function(selection2) {
+ _anchorSelection = selection2;
+ selection2.each(setup);
+ };
+ var _animation = utilFunctor(false);
+ var _placement = utilFunctor("top");
+ var _alignment = utilFunctor("center");
+ var _scrollContainer = utilFunctor(select_default2(null));
+ var _content;
+ var _displayType = utilFunctor("");
+ var _hasArrow = utilFunctor(true);
+ var _pointerPrefix = "PointerEvent" in window ? "pointer" : "mouse";
+ popover.displayType = function(val) {
+ if (arguments.length) {
+ _displayType = utilFunctor(val);
+ return popover;
+ } else {
+ return _displayType;
+ }
+ };
+ popover.hasArrow = function(val) {
+ if (arguments.length) {
+ _hasArrow = utilFunctor(val);
+ return popover;
+ } else {
+ return _hasArrow;
}
- const sources = background.sources(context.map().extent());
- const wasValid = _isValid;
- _isValid = !!sources.filter((d) => d === currSource).length;
- if (wasValid !== _isValid) {
- background.updateImagery();
+ };
+ popover.placement = function(val) {
+ if (arguments.length) {
+ _placement = utilFunctor(val);
+ return popover;
+ } else {
+ return _placement;
}
- let baseFilter = "";
- if (_brightness !== 1) {
- baseFilter += ` brightness(${_brightness})`;
+ };
+ popover.alignment = function(val) {
+ if (arguments.length) {
+ _alignment = utilFunctor(val);
+ return popover;
+ } else {
+ return _alignment;
}
- if (_contrast !== 1) {
- baseFilter += ` contrast(${_contrast})`;
+ };
+ popover.scrollContainer = function(val) {
+ if (arguments.length) {
+ _scrollContainer = utilFunctor(val);
+ return popover;
+ } else {
+ return _scrollContainer;
}
- if (_saturation !== 1) {
- baseFilter += ` saturate(${_saturation})`;
+ };
+ popover.content = function(val) {
+ if (arguments.length) {
+ _content = val;
+ return popover;
+ } else {
+ return _content;
}
- if (_sharpness < 1) {
- const blur = number_default(0.5, 5)(1 - _sharpness);
- baseFilter += ` blur(${blur}px)`;
+ };
+ popover.isShown = function() {
+ var popoverSelection = _anchorSelection.select(".popover-" + _id);
+ return !popoverSelection.empty() && popoverSelection.classed("in");
+ };
+ popover.show = function() {
+ _anchorSelection.each(show);
+ };
+ popover.updateContent = function() {
+ _anchorSelection.each(updateContent);
+ };
+ popover.hide = function() {
+ _anchorSelection.each(hide);
+ };
+ popover.toggle = function() {
+ _anchorSelection.each(toggle);
+ };
+ popover.destroy = function(selection2, selector) {
+ selector = selector || ".popover-" + _id;
+ selection2.on(_pointerPrefix + "enter.popover", null).on(_pointerPrefix + "leave.popover", null).on(_pointerPrefix + "up.popover", null).on(_pointerPrefix + "down.popover", null).on("click.popover", null).attr("title", function() {
+ return this.getAttribute("data-original-title") || this.getAttribute("title");
+ }).attr("data-original-title", null).selectAll(selector).remove();
+ };
+ popover.destroyAny = function(selection2) {
+ selection2.call(popover.destroy, ".popover");
+ };
+ function setup() {
+ var anchor = select_default2(this);
+ var animate = _animation.apply(this, arguments);
+ var popoverSelection = anchor.selectAll(".popover-" + _id).data([0]);
+ var enter = popoverSelection.enter().append("div").attr("class", "popover popover-" + _id + " " + (klass ? klass : "")).classed("arrowed", _hasArrow.apply(this, arguments));
+ enter.append("div").attr("class", "popover-arrow");
+ enter.append("div").attr("class", "popover-inner");
+ popoverSelection = enter.merge(popoverSelection);
+ if (animate) {
+ popoverSelection.classed("fade", true);
}
- let base = selection2.selectAll(".layer-background").data([0]);
- base = base.enter().insert("div", ".layer-data").attr("class", "layer layer-background").merge(base);
- base.style("filter", baseFilter || null);
- let imagery = base.selectAll(".layer-imagery").data([0]);
- imagery.enter().append("div").attr("class", "layer layer-imagery").merge(imagery).call(baseLayer);
- let maskFilter = "";
- let mixBlendMode = "";
- if (_sharpness > 1) {
- mixBlendMode = "overlay";
- maskFilter = "saturate(0) blur(3px) invert(1)";
- let contrast = _sharpness - 1;
- maskFilter += ` contrast(${contrast})`;
- let brightness = number_default(1, 0.85)(_sharpness - 1);
- maskFilter += ` brightness(${brightness})`;
+ var display = _displayType.apply(this, arguments);
+ if (display === "hover") {
+ var _lastNonMouseEnterTime;
+ anchor.on(_pointerPrefix + "enter.popover", function(d3_event) {
+ if (d3_event.pointerType) {
+ if (d3_event.pointerType !== "mouse") {
+ _lastNonMouseEnterTime = d3_event.timeStamp;
+ return;
+ } else if (_lastNonMouseEnterTime && d3_event.timeStamp - _lastNonMouseEnterTime < 1500) {
+ return;
+ }
+ }
+ if (d3_event.buttons !== 0) return;
+ show.apply(this, arguments);
+ }).on(_pointerPrefix + "leave.popover", function() {
+ hide.apply(this, arguments);
+ }).on("focus.popover", function() {
+ show.apply(this, arguments);
+ }).on("blur.popover", function() {
+ hide.apply(this, arguments);
+ });
+ } else if (display === "clickFocus") {
+ anchor.on(_pointerPrefix + "down.popover", function(d3_event) {
+ d3_event.preventDefault();
+ d3_event.stopPropagation();
+ }).on(_pointerPrefix + "up.popover", function(d3_event) {
+ d3_event.preventDefault();
+ d3_event.stopPropagation();
+ }).on("click.popover", toggle);
+ popoverSelection.attr("tabindex", 0).on("blur.popover", function() {
+ anchor.each(function() {
+ hide.apply(this, arguments);
+ });
+ });
}
- let mask = base.selectAll(".layer-unsharp-mask").data(_sharpness > 1 ? [0] : []);
- mask.exit().remove();
- mask.enter().append("div").attr("class", "layer layer-mask layer-unsharp-mask").merge(mask).call(baseLayer).style("filter", maskFilter || null).style("mix-blend-mode", mixBlendMode || null);
- let overlays = selection2.selectAll(".layer-overlay").data(_overlayLayers, (d) => d.source().name());
- overlays.exit().remove();
- overlays.enter().insert("div", ".layer-data").attr("class", "layer layer-overlay").merge(overlays).each((layer, i2, nodes) => select_default2(nodes[i2]).call(layer));
}
- background.updateImagery = function() {
- let currSource = baseLayer.source();
- if (context.inIntro() || !currSource)
- return;
- let o = _overlayLayers.filter((d) => !d.source().isLocatorOverlay() && !d.source().isHidden()).map((d) => d.source().id).join(",");
- const meters = geoOffsetToMeters(currSource.offset());
- const EPSILON = 0.01;
- const x = +meters[0].toFixed(2);
- const y = +meters[1].toFixed(2);
- let hash = utilStringQs(window.location.hash);
- let id2 = currSource.id;
- if (id2 === "custom") {
- id2 = `custom:${currSource.template()}`;
- }
- if (id2) {
- hash.background = id2;
- } else {
- delete hash.background;
+ function show() {
+ var anchor = select_default2(this);
+ var popoverSelection = anchor.selectAll(".popover-" + _id);
+ if (popoverSelection.empty()) {
+ anchor.call(popover.destroy);
+ anchor.each(setup);
+ popoverSelection = anchor.selectAll(".popover-" + _id);
}
- if (o) {
- hash.overlays = o;
- } else {
- delete hash.overlays;
+ popoverSelection.classed("in", true);
+ var displayType = _displayType.apply(this, arguments);
+ if (displayType === "clickFocus") {
+ anchor.classed("active", true);
+ popoverSelection.node().focus();
}
- if (Math.abs(x) > EPSILON || Math.abs(y) > EPSILON) {
- hash.offset = `${x},${y}`;
- } else {
- delete hash.offset;
+ anchor.each(updateContent);
+ }
+ function updateContent() {
+ var anchor = select_default2(this);
+ if (_content) {
+ anchor.selectAll(".popover-" + _id + " > .popover-inner").call(_content.apply(this, arguments));
}
- if (!window.mocha) {
- window.location.replace("#" + utilQsString(hash, true));
+ updatePosition.apply(this, arguments);
+ updatePosition.apply(this, arguments);
+ updatePosition.apply(this, arguments);
+ }
+ function updatePosition() {
+ var anchor = select_default2(this);
+ var popoverSelection = anchor.selectAll(".popover-" + _id);
+ var scrollContainer = _scrollContainer && _scrollContainer.apply(this, arguments);
+ var scrollNode = scrollContainer && !scrollContainer.empty() && scrollContainer.node();
+ var scrollLeft = scrollNode ? scrollNode.scrollLeft : 0;
+ var scrollTop = scrollNode ? scrollNode.scrollTop : 0;
+ var placement = _placement.apply(this, arguments);
+ popoverSelection.classed("left", false).classed("right", false).classed("top", false).classed("bottom", false).classed(placement, true);
+ var alignment = _alignment.apply(this, arguments);
+ var alignFactor = 0.5;
+ if (alignment === "leading") {
+ alignFactor = 0;
+ } else if (alignment === "trailing") {
+ alignFactor = 1;
}
- let imageryUsed = [];
- let photoOverlaysUsed = [];
- const currUsed = currSource.imageryUsed();
- if (currUsed && _isValid) {
- imageryUsed.push(currUsed);
+ var anchorFrame = getFrame(anchor.node());
+ var popoverFrame = getFrame(popoverSelection.node());
+ var position;
+ switch (placement) {
+ case "top":
+ position = {
+ x: anchorFrame.x + (anchorFrame.w - popoverFrame.w) * alignFactor,
+ y: anchorFrame.y - popoverFrame.h
+ };
+ break;
+ case "bottom":
+ position = {
+ x: anchorFrame.x + (anchorFrame.w - popoverFrame.w) * alignFactor,
+ y: anchorFrame.y + anchorFrame.h
+ };
+ break;
+ case "left":
+ position = {
+ x: anchorFrame.x - popoverFrame.w,
+ y: anchorFrame.y + (anchorFrame.h - popoverFrame.h) * alignFactor
+ };
+ break;
+ case "right":
+ position = {
+ x: anchorFrame.x + anchorFrame.w,
+ y: anchorFrame.y + (anchorFrame.h - popoverFrame.h) * alignFactor
+ };
+ break;
}
- _overlayLayers.filter((d) => !d.source().isLocatorOverlay() && !d.source().isHidden()).forEach((d) => imageryUsed.push(d.source().imageryUsed()));
- const dataLayer = context.layers().layer("data");
- if (dataLayer && dataLayer.enabled() && dataLayer.hasData()) {
- imageryUsed.push(dataLayer.getSrc());
+ if (position) {
+ if (scrollNode && (placement === "top" || placement === "bottom")) {
+ var initialPosX = position.x;
+ if (position.x + popoverFrame.w > scrollNode.offsetWidth - 10) {
+ position.x = scrollNode.offsetWidth - 10 - popoverFrame.w;
+ } else if (position.x < 10) {
+ position.x = 10;
+ }
+ var arrow = anchor.selectAll(".popover-" + _id + " > .popover-arrow");
+ var arrowPosX = Math.min(Math.max(popoverFrame.w / 2 - (position.x - initialPosX), 10), popoverFrame.w - 10);
+ arrow.style("left", ~~arrowPosX + "px");
+ }
+ popoverSelection.style("left", ~~position.x + "px").style("top", ~~position.y + "px");
+ } else {
+ popoverSelection.style("left", null).style("top", null);
}
- const photoOverlayLayers = {
- streetside: "Bing Streetside",
- mapillary: "Mapillary Images",
- "mapillary-map-features": "Mapillary Map Features",
- "mapillary-signs": "Mapillary Signs",
- kartaview: "KartaView Images"
- };
- for (let layerID in photoOverlayLayers) {
- const layer = context.layers().layer(layerID);
- if (layer && layer.enabled()) {
- photoOverlaysUsed.push(layerID);
- imageryUsed.push(photoOverlayLayers[layerID]);
+ function getFrame(node) {
+ var positionStyle = select_default2(node).style("position");
+ if (positionStyle === "absolute" || positionStyle === "static") {
+ return {
+ x: node.offsetLeft - scrollLeft,
+ y: node.offsetTop - scrollTop,
+ w: node.offsetWidth,
+ h: node.offsetHeight
+ };
+ } else {
+ return {
+ x: 0,
+ y: 0,
+ w: node.offsetWidth,
+ h: node.offsetHeight
+ };
}
}
- context.history().imageryUsed(imageryUsed);
- context.history().photoOverlaysUsed(photoOverlaysUsed);
- };
- background.sources = (extent, zoom, includeCurrent) => {
- if (!_imageryIndex)
- return [];
- let visible = {};
- (_imageryIndex.query.bbox(extent.rectangle(), true) || []).forEach((d) => visible[d.id] = true);
- const currSource = baseLayer.source();
- const osm = context.connection();
- const blocklists = osm && osm.imageryBlocklists() || [];
- const blocklistChanged = blocklists.length !== _checkedBlocklists.length || blocklists.some((regex, index) => String(regex) !== _checkedBlocklists[index]);
- if (blocklistChanged) {
- _imageryIndex.backgrounds.forEach((source) => {
- source.isBlocked = blocklists.some((regex) => regex.test(source.template()));
- });
- _checkedBlocklists = blocklists.map((regex) => String(regex));
+ }
+ function hide() {
+ var anchor = select_default2(this);
+ if (_displayType.apply(this, arguments) === "clickFocus") {
+ anchor.classed("active", false);
}
- return _imageryIndex.backgrounds.filter((source) => {
- if (includeCurrent && currSource === source)
- return true;
- if (source.isBlocked)
- return false;
- if (!source.polygon)
- return true;
- if (zoom && zoom < 6)
- return false;
- return visible[source.id];
- });
- };
- background.dimensions = (val) => {
- if (!val)
- return;
- baseLayer.dimensions(val);
- _overlayLayers.forEach((layer) => layer.dimensions(val));
- };
- background.baseLayerSource = function(d) {
- if (!arguments.length)
- return baseLayer.source();
- const osm = context.connection();
- if (!osm)
- return background;
- const blocklists = osm.imageryBlocklists();
- const template = d.template();
- let fail = false;
- let tested = 0;
- let regex;
- for (let i2 = 0; i2 < blocklists.length; i2++) {
- regex = blocklists[i2];
- fail = regex.test(template);
- tested++;
- if (fail)
- break;
+ anchor.selectAll(".popover-" + _id).classed("in", false);
+ }
+ function toggle() {
+ if (select_default2(this).select(".popover-" + _id).classed("in")) {
+ hide.apply(this, arguments);
+ } else {
+ show.apply(this, arguments);
}
- if (!tested) {
- regex = /.*\.google(apis)?\..*\/(vt|kh)[\?\/].*([xyz]=.*){3}.*/;
- fail = regex.test(template);
+ }
+ return popover;
+ }
+
+ // modules/ui/tooltip.js
+ function uiTooltip(klass) {
+ var tooltip = uiPopover((klass || "") + " tooltip").displayType("hover");
+ var _title = function() {
+ var title = this.getAttribute("data-original-title");
+ if (title) {
+ return title;
+ } else {
+ title = this.getAttribute("title");
+ this.removeAttribute("title");
+ this.setAttribute("data-original-title", title);
}
- baseLayer.source(!fail ? d : background.findSource("none"));
- dispatch10.call("change");
- background.updateImagery();
- return background;
+ return title;
};
- background.findSource = (id2) => {
- if (!id2 || !_imageryIndex)
- return null;
- return _imageryIndex.backgrounds.find((d) => d.id && d.id === id2);
+ var _heading = utilFunctor(null);
+ var _keys = utilFunctor(null);
+ tooltip.title = function(val) {
+ if (!arguments.length) return _title;
+ _title = utilFunctor(val);
+ return tooltip;
};
- background.bing = () => {
- background.baseLayerSource(background.findSource("Bing"));
+ tooltip.heading = function(val) {
+ if (!arguments.length) return _heading;
+ _heading = utilFunctor(val);
+ return tooltip;
};
- background.showsLayer = (d) => {
- const currSource = baseLayer.source();
- if (!d || !currSource)
- return false;
- return d.id === currSource.id || _overlayLayers.some((layer) => d.id === layer.source().id);
+ tooltip.keys = function(val) {
+ if (!arguments.length) return _keys;
+ _keys = utilFunctor(val);
+ return tooltip;
};
- background.overlayLayerSources = () => {
- return _overlayLayers.map((layer) => layer.source());
+ tooltip.content(function() {
+ var heading2 = _heading.apply(this, arguments);
+ var text = _title.apply(this, arguments);
+ var keys2 = _keys.apply(this, arguments);
+ var headingCallback = typeof heading2 === "function" ? heading2 : (s2) => s2.text(heading2);
+ var textCallback = typeof text === "function" ? text : (s2) => s2.text(text);
+ return function(selection2) {
+ var headingSelect = selection2.selectAll(".tooltip-heading").data(heading2 ? [heading2] : []);
+ headingSelect.exit().remove();
+ headingSelect.enter().append("div").attr("class", "tooltip-heading").merge(headingSelect).text("").call(headingCallback);
+ var textSelect = selection2.selectAll(".tooltip-text").data(text ? [text] : []);
+ textSelect.exit().remove();
+ textSelect.enter().append("div").attr("class", "tooltip-text").merge(textSelect).text("").call(textCallback);
+ var keyhintWrap = selection2.selectAll(".keyhint-wrap").data(keys2 && keys2.length ? [0] : []);
+ keyhintWrap.exit().remove();
+ var keyhintWrapEnter = keyhintWrap.enter().append("div").attr("class", "keyhint-wrap");
+ keyhintWrapEnter.append("span").call(_t.append("tooltip_keyhint"));
+ keyhintWrap = keyhintWrapEnter.merge(keyhintWrap);
+ keyhintWrap.selectAll("kbd.shortcut").data(keys2 && keys2.length ? keys2 : []).enter().append("kbd").attr("class", "shortcut").text(function(d2) {
+ return d2;
+ });
+ };
+ });
+ return tooltip;
+ }
+
+ // modules/ui/combobox.js
+ var _comboHideTimerID;
+ function uiCombobox(context, klass) {
+ var dispatch14 = dispatch_default("accept", "cancel", "update");
+ var container = context.container();
+ var _suggestions = [];
+ var _data = [];
+ var _fetched = {};
+ var _selected = null;
+ var _canAutocomplete = true;
+ var _caseSensitive = false;
+ var _cancelFetch = false;
+ var _minItems = 2;
+ var _tDown = 0;
+ var _mouseEnterHandler, _mouseLeaveHandler;
+ var _fetcher = function(val, cb) {
+ cb(_data.filter(function(d2) {
+ var terms = d2.terms || [];
+ terms.push(d2.value);
+ if (d2.key) {
+ terms.push(d2.key);
+ }
+ return terms.some(function(term) {
+ return term.toString().toLowerCase().indexOf(val.toLowerCase()) !== -1;
+ });
+ }));
};
- background.toggleOverlayLayer = (d) => {
- let layer;
- for (let i2 = 0; i2 < _overlayLayers.length; i2++) {
- layer = _overlayLayers[i2];
- if (layer.source() === d) {
- _overlayLayers.splice(i2, 1);
- dispatch10.call("change");
- background.updateImagery();
+ var combobox = function(input, attachTo) {
+ if (!input || input.empty()) return;
+ input.classed("combobox-input", true).on("focus.combo-input", focus).on("blur.combo-input", blur).on("keydown.combo-input", keydown).on("keyup.combo-input", keyup).on("input.combo-input", change).on("mousedown.combo-input", mousedown).each(function() {
+ var parent = this.parentNode;
+ var sibling = this.nextSibling;
+ select_default2(parent).selectAll(".combobox-caret").filter(function(d2) {
+ return d2 === input.node();
+ }).data([input.node()]).enter().insert("div", function() {
+ return sibling;
+ }).attr("class", "combobox-caret").on("mousedown.combo-caret", function(d3_event) {
+ d3_event.preventDefault();
+ input.node().focus();
+ mousedown(d3_event);
+ }).on("mouseup.combo-caret", function(d3_event) {
+ d3_event.preventDefault();
+ mouseup(d3_event);
+ });
+ });
+ function mousedown(d3_event) {
+ if (d3_event.button !== 0) return;
+ if (input.classed("disabled")) return;
+ _tDown = +/* @__PURE__ */ new Date();
+ var start2 = input.property("selectionStart");
+ var end = input.property("selectionEnd");
+ if (start2 !== end) {
+ var val = utilGetSetValue(input);
+ input.node().setSelectionRange(val.length, val.length);
return;
}
+ input.on("mouseup.combo-input", mouseup);
}
- layer = rendererTileLayer(context).source(d).projection(context.projection).dimensions(baseLayer.dimensions());
- _overlayLayers.push(layer);
- dispatch10.call("change");
- background.updateImagery();
- };
- background.nudge = (d, zoom) => {
- const currSource = baseLayer.source();
- if (currSource) {
- currSource.nudge(d, zoom);
- dispatch10.call("change");
- background.updateImagery();
+ function mouseup(d3_event) {
+ input.on("mouseup.combo-input", null);
+ if (d3_event.button !== 0) return;
+ if (input.classed("disabled")) return;
+ if (input.node() !== document.activeElement) return;
+ var start2 = input.property("selectionStart");
+ var end = input.property("selectionEnd");
+ if (start2 !== end) return;
+ var combo = container.selectAll(".combobox");
+ if (combo.empty() || combo.datum() !== input.node()) {
+ var tOrig = _tDown;
+ window.setTimeout(function() {
+ if (tOrig !== _tDown) return;
+ fetchComboData("", function() {
+ show();
+ render();
+ });
+ }, 250);
+ } else {
+ hide();
+ }
}
- return background;
- };
- background.offset = function(d) {
- const currSource = baseLayer.source();
- if (!arguments.length) {
- return currSource && currSource.offset() || [0, 0];
+ function focus() {
+ fetchComboData("");
}
- if (currSource) {
- currSource.offset(d);
- dispatch10.call("change");
- background.updateImagery();
+ function blur() {
+ _comboHideTimerID = window.setTimeout(hide, 75);
+ }
+ function show() {
+ hide();
+ container.insert("div", ":first-child").datum(input.node()).attr("class", "combobox" + (klass ? " combobox-" + klass : "")).style("position", "absolute").style("display", "block").style("left", "0px").on("mousedown.combo-container", function(d3_event) {
+ d3_event.preventDefault();
+ });
+ container.on("scroll.combo-scroll", render, true);
+ }
+ function hide() {
+ if (_comboHideTimerID) {
+ window.clearTimeout(_comboHideTimerID);
+ _comboHideTimerID = void 0;
+ }
+ container.selectAll(".combobox").remove();
+ container.on("scroll.combo-scroll", null);
+ }
+ function keydown(d3_event) {
+ var shown = !container.selectAll(".combobox").empty();
+ var tagName = input.node() ? input.node().tagName.toLowerCase() : "";
+ switch (d3_event.keyCode) {
+ case 8:
+ // â« Backspace
+ case 46:
+ d3_event.stopPropagation();
+ _selected = null;
+ render();
+ input.on("input.combo-input", function() {
+ var start2 = input.property("selectionStart");
+ input.node().setSelectionRange(start2, start2);
+ input.on("input.combo-input", change);
+ change(false);
+ });
+ break;
+ case 9:
+ accept(d3_event);
+ break;
+ case 13:
+ d3_event.preventDefault();
+ d3_event.stopPropagation();
+ accept(d3_event);
+ break;
+ case 38:
+ if (tagName === "textarea" && !shown) return;
+ d3_event.preventDefault();
+ if (tagName === "input" && !shown) {
+ show();
+ }
+ nav(-1);
+ break;
+ case 40:
+ if (tagName === "textarea" && !shown) return;
+ d3_event.preventDefault();
+ if (tagName === "input" && !shown) {
+ show();
+ }
+ nav(1);
+ break;
+ }
+ }
+ function keyup(d3_event) {
+ switch (d3_event.keyCode) {
+ case 27:
+ cancel();
+ break;
+ }
+ }
+ function change(doAutoComplete) {
+ if (doAutoComplete === void 0) doAutoComplete = true;
+ fetchComboData(value(), function(skipAutosuggest) {
+ _selected = null;
+ var val = input.property("value");
+ if (_suggestions.length) {
+ if (doAutoComplete && !skipAutosuggest && input.property("selectionEnd") === val.length) {
+ _selected = tryAutocomplete();
+ }
+ if (!_selected) {
+ _selected = val;
+ }
+ }
+ if (val.length) {
+ var combo = container.selectAll(".combobox");
+ if (combo.empty()) {
+ show();
+ }
+ } else {
+ hide();
+ }
+ render();
+ });
}
- return background;
- };
- background.brightness = function(d) {
- if (!arguments.length)
- return _brightness;
- _brightness = d;
- if (context.mode())
- dispatch10.call("change");
- return background;
- };
- background.contrast = function(d) {
- if (!arguments.length)
- return _contrast;
- _contrast = d;
- if (context.mode())
- dispatch10.call("change");
- return background;
- };
- background.saturation = function(d) {
- if (!arguments.length)
- return _saturation;
- _saturation = d;
- if (context.mode())
- dispatch10.call("change");
- return background;
- };
- background.sharpness = function(d) {
- if (!arguments.length)
- return _sharpness;
- _sharpness = d;
- if (context.mode())
- dispatch10.call("change");
- return background;
- };
- let _loadPromise;
- background.ensureLoaded = () => {
- if (_loadPromise)
- return _loadPromise;
- function parseMapParams(qmap) {
- if (!qmap)
- return false;
- const params = qmap.split("/").map(Number);
- if (params.length < 3 || params.some(isNaN))
- return false;
- return geoExtent([params[2], params[1]]);
+ function nav(dir) {
+ if (_suggestions.length) {
+ var index = -1;
+ for (var i3 = 0; i3 < _suggestions.length; i3++) {
+ if (_selected && _suggestions[i3].value === _selected) {
+ index = i3;
+ break;
+ }
+ }
+ index = Math.max(Math.min(index + dir, _suggestions.length - 1), 0);
+ _selected = _suggestions[index].value;
+ utilGetSetValue(input, _selected);
+ dispatch14.call("update");
+ }
+ render();
+ ensureVisible();
}
- const hash = utilStringQs(window.location.hash);
- const requested = hash.background || hash.layer;
- let extent = parseMapParams(hash.map);
- return _loadPromise = ensureImageryIndex().then((imageryIndex) => {
- const first = imageryIndex.backgrounds.length && imageryIndex.backgrounds[0];
- let best;
- if (!requested && extent) {
- best = background.sources(extent).find((s) => s.best());
+ function ensureVisible() {
+ var _a4;
+ var combo = container.selectAll(".combobox");
+ if (combo.empty()) return;
+ var containerRect = container.node().getBoundingClientRect();
+ var comboRect = combo.node().getBoundingClientRect();
+ if (comboRect.bottom > containerRect.bottom) {
+ var node = attachTo ? attachTo.node() : input.node();
+ node.scrollIntoView({ behavior: "instant", block: "center" });
+ render();
}
- if (requested && requested.indexOf("custom:") === 0) {
- const template = requested.replace(/^custom:/, "");
- const custom = background.findSource("custom");
- background.baseLayerSource(custom.template(template));
- corePreferences("background-custom-template", template);
- } else {
- background.baseLayerSource(background.findSource(requested) || best || background.findSource(corePreferences("background-last-used")) || background.findSource("Bing") || first || background.findSource("none"));
+ var selected = combo.selectAll(".combobox-option.selected").node();
+ if (selected) {
+ (_a4 = selected.scrollIntoView) == null ? void 0 : _a4.call(selected, { behavior: "smooth", block: "nearest" });
}
- const locator = imageryIndex.backgrounds.find((d) => d.overlay && d.default);
- if (locator) {
- background.toggleOverlayLayer(locator);
+ }
+ function value() {
+ var value2 = input.property("value");
+ var start2 = input.property("selectionStart");
+ var end = input.property("selectionEnd");
+ if (start2 && end) {
+ value2 = value2.substring(0, start2);
}
- const overlays = (hash.overlays || "").split(",");
- overlays.forEach((overlay) => {
- overlay = background.findSource(overlay);
- if (overlay) {
- background.toggleOverlayLayer(overlay);
+ return value2;
+ }
+ function fetchComboData(v2, cb) {
+ _cancelFetch = false;
+ _fetcher.call(input, v2, function(results, skipAutosuggest) {
+ if (_cancelFetch) return;
+ _suggestions = results;
+ results.forEach(function(d2) {
+ _fetched[d2.value] = d2;
+ });
+ if (cb) {
+ cb(skipAutosuggest);
}
});
- if (hash.gpx) {
- const gpx2 = context.layers().layer("data");
- if (gpx2) {
- gpx2.url(hash.gpx, ".gpx");
+ }
+ function tryAutocomplete() {
+ if (!_canAutocomplete) return;
+ var val = _caseSensitive ? value() : value().toLowerCase();
+ if (!val) return;
+ if (isFinite(val)) return;
+ const suggestionValues = [];
+ _suggestions.forEach((s2) => {
+ suggestionValues.push(s2.value);
+ if (s2.key && s2.key !== s2.value) {
+ suggestionValues.push(s2.key);
}
- }
- if (hash.offset) {
- const offset = hash.offset.replace(/;/g, ",").split(",").map((n2) => !isNaN(n2) && n2);
- if (offset.length === 2) {
- background.offset(geoMetersToOffset(offset));
+ });
+ var bestIndex = -1;
+ for (var i3 = 0; i3 < suggestionValues.length; i3++) {
+ var suggestion = suggestionValues[i3];
+ var compare2 = _caseSensitive ? suggestion : suggestion.toLowerCase();
+ if (compare2 === val) {
+ bestIndex = i3;
+ break;
+ } else if (bestIndex === -1 && compare2.indexOf(val) === 0) {
+ bestIndex = i3;
}
}
- }).catch(() => {
- });
- };
- return utilRebind(background, dispatch10, "on");
- }
-
- // modules/renderer/features.js
- function rendererFeatures(context) {
- var dispatch10 = dispatch_default("change", "redraw");
- var features2 = utilRebind({}, dispatch10, "on");
- var _deferred2 = /* @__PURE__ */ new Set();
- var traffic_roads = {
- "motorway": true,
- "motorway_link": true,
- "trunk": true,
- "trunk_link": true,
- "primary": true,
- "primary_link": true,
- "secondary": true,
- "secondary_link": true,
- "tertiary": true,
- "tertiary_link": true,
- "residential": true,
- "unclassified": true,
- "living_street": true
- };
- var service_roads = {
- "service": true,
- "road": true,
- "track": true
- };
- var paths = {
- "path": true,
- "footway": true,
- "cycleway": true,
- "bridleway": true,
- "steps": true,
- "pedestrian": true
- };
- var past_futures = {
- "proposed": true,
- "construction": true,
- "abandoned": true,
- "dismantled": true,
- "disused": true,
- "razed": true,
- "demolished": true,
- "obliterated": true
- };
- var _cullFactor = 1;
- var _cache4 = {};
- var _rules = {};
- var _stats = {};
- var _keys = [];
- var _hidden = [];
- var _forceVisible = {};
- function update() {
- if (!window.mocha) {
- var hash = utilStringQs(window.location.hash);
- var disabled = features2.disabled();
- if (disabled.length) {
- hash.disable_features = disabled.join(",");
- } else {
- delete hash.disable_features;
+ if (bestIndex !== -1) {
+ var bestVal = suggestionValues[bestIndex];
+ input.property("value", bestVal);
+ input.node().setSelectionRange(val.length, bestVal.length);
+ dispatch14.call("update");
+ return bestVal;
}
- window.location.replace("#" + utilQsString(hash, true));
- corePreferences("disabled-features", disabled.join(","));
}
- _hidden = features2.hidden();
- dispatch10.call("change");
- dispatch10.call("redraw");
- }
- function defineRule(k, filter2, max3) {
- var isEnabled = true;
- _keys.push(k);
- _rules[k] = {
- filter: filter2,
- enabled: isEnabled,
- count: 0,
- currentMax: max3 || Infinity,
- defaultMax: max3 || Infinity,
- enable: function() {
- this.enabled = true;
- this.currentMax = this.defaultMax;
- },
- disable: function() {
- this.enabled = false;
- this.currentMax = 0;
- },
- hidden: function() {
- return this.count === 0 && !this.enabled || this.count > this.currentMax * _cullFactor;
- },
- autoHidden: function() {
- return this.hidden() && this.currentMax > 0;
+ function render() {
+ if (_suggestions.length < _minItems || document.activeElement !== input.node()) {
+ hide();
+ return;
}
- };
- }
- defineRule("points", function isPoint(tags, geometry) {
- return geometry === "point";
- }, 200);
- defineRule("traffic_roads", function isTrafficRoad(tags) {
- return traffic_roads[tags.highway];
- });
- defineRule("service_roads", function isServiceRoad(tags) {
- return service_roads[tags.highway];
- });
- defineRule("paths", function isPath(tags) {
- return paths[tags.highway];
- });
- defineRule("buildings", function isBuilding(tags) {
- return !!tags.building && tags.building !== "no" || tags.parking === "multi-storey" || tags.parking === "sheds" || tags.parking === "carports" || tags.parking === "garage_boxes";
- }, 250);
- defineRule("building_parts", function isBuildingPart(tags) {
- return tags["building:part"];
- });
- defineRule("indoor", function isIndoor(tags) {
- return tags.indoor;
- });
- defineRule("landuse", function isLanduse(tags, geometry) {
- return geometry === "area" && !_rules.buildings.filter(tags) && !_rules.building_parts.filter(tags) && !_rules.indoor.filter(tags) && !_rules.water.filter(tags) && !_rules.pistes.filter(tags);
- });
- defineRule("boundaries", function isBoundary(tags) {
- return !!tags.boundary && !(traffic_roads[tags.highway] || service_roads[tags.highway] || paths[tags.highway] || tags.waterway || tags.railway || tags.landuse || tags.natural || tags.building || tags.power);
- });
- defineRule("water", function isWater(tags) {
- return !!tags.waterway || tags.natural === "water" || tags.natural === "coastline" || tags.natural === "bay" || tags.landuse === "pond" || tags.landuse === "basin" || tags.landuse === "reservoir" || tags.landuse === "salt_pond";
- });
- defineRule("rail", function isRail(tags) {
- return (!!tags.railway || tags.landuse === "railway") && !(traffic_roads[tags.highway] || service_roads[tags.highway] || paths[tags.highway]);
- });
- defineRule("pistes", function isPiste(tags) {
- return tags["piste:type"];
- });
- defineRule("aerialways", function isPiste(tags) {
- return tags.aerialway && tags.aerialway !== "yes" && tags.aerialway !== "station";
- });
- defineRule("power", function isPower(tags) {
- return !!tags.power;
- });
- defineRule("past_future", function isPastFuture(tags) {
- if (traffic_roads[tags.highway] || service_roads[tags.highway] || paths[tags.highway]) {
- return false;
+ var shown = !container.selectAll(".combobox").empty();
+ if (!shown) return;
+ var combo = container.selectAll(".combobox");
+ var options2 = combo.selectAll(".combobox-option").data(_suggestions, function(d2) {
+ return d2.value;
+ });
+ options2.exit().remove();
+ options2.enter().append("a").attr("class", function(d2) {
+ return "combobox-option " + (d2.klass || "");
+ }).attr("title", function(d2) {
+ return d2.title;
+ }).each(function(d2) {
+ if (d2.display) {
+ d2.display(select_default2(this));
+ } else {
+ select_default2(this).text(d2.value);
+ }
+ }).on("mouseenter", _mouseEnterHandler).on("mouseleave", _mouseLeaveHandler).merge(options2).classed("selected", function(d2) {
+ return d2.value === _selected || d2.key === _selected;
+ }).on("click.combo-option", accept).order();
+ var node = attachTo ? attachTo.node() : input.node();
+ var containerRect = container.node().getBoundingClientRect();
+ var rect = node.getBoundingClientRect();
+ combo.style("left", rect.left + 5 - containerRect.left + "px").style("width", rect.width - 10 + "px").style("top", rect.height + rect.top - containerRect.top + "px");
}
- var strings = Object.keys(tags);
- for (var i2 = 0; i2 < strings.length; i2++) {
- var s = strings[i2];
- if (past_futures[s] || past_futures[tags[s]]) {
- return true;
+ function accept(d3_event, d2) {
+ _cancelFetch = true;
+ var thiz = input.node();
+ if (d2) {
+ utilGetSetValue(input, d2.value);
+ utilTriggerEvent(input, "change");
+ }
+ var val = utilGetSetValue(input);
+ thiz.setSelectionRange(val.length, val.length);
+ if (!d2) {
+ d2 = _fetched[val];
}
+ dispatch14.call("accept", thiz, d2, val);
+ hide();
}
- return false;
- });
- defineRule("others", function isOther(tags, geometry) {
- return geometry === "line" || geometry === "area";
- });
- features2.features = function() {
- return _rules;
- };
- features2.keys = function() {
- return _keys;
- };
- features2.enabled = function(k) {
- if (!arguments.length) {
- return _keys.filter(function(k2) {
- return _rules[k2].enabled;
- });
+ function cancel() {
+ _cancelFetch = true;
+ var thiz = input.node();
+ var val = utilGetSetValue(input);
+ var start2 = input.property("selectionStart");
+ var end = input.property("selectionEnd");
+ val = val.slice(0, start2) + val.slice(end);
+ utilGetSetValue(input, val);
+ thiz.setSelectionRange(val.length, val.length);
+ dispatch14.call("cancel", thiz);
+ hide();
}
- return _rules[k] && _rules[k].enabled;
};
- features2.disabled = function(k) {
- if (!arguments.length) {
- return _keys.filter(function(k2) {
- return !_rules[k2].enabled;
- });
- }
- return _rules[k] && !_rules[k].enabled;
+ combobox.canAutocomplete = function(val) {
+ if (!arguments.length) return _canAutocomplete;
+ _canAutocomplete = val;
+ return combobox;
};
- features2.hidden = function(k) {
- if (!arguments.length) {
- return _keys.filter(function(k2) {
- return _rules[k2].hidden();
- });
- }
- return _rules[k] && _rules[k].hidden();
+ combobox.caseSensitive = function(val) {
+ if (!arguments.length) return _caseSensitive;
+ _caseSensitive = val;
+ return combobox;
};
- features2.autoHidden = function(k) {
- if (!arguments.length) {
- return _keys.filter(function(k2) {
- return _rules[k2].autoHidden();
- });
- }
- return _rules[k] && _rules[k].autoHidden();
+ combobox.data = function(val) {
+ if (!arguments.length) return _data;
+ _data = val;
+ return combobox;
};
- features2.enable = function(k) {
- if (_rules[k] && !_rules[k].enabled) {
- _rules[k].enable();
- update();
- }
+ combobox.fetcher = function(val) {
+ if (!arguments.length) return _fetcher;
+ _fetcher = val;
+ return combobox;
};
- features2.enableAll = function() {
- var didEnable = false;
- for (var k in _rules) {
- if (!_rules[k].enabled) {
- didEnable = true;
- _rules[k].enable();
- }
- }
- if (didEnable)
- update();
+ combobox.minItems = function(val) {
+ if (!arguments.length) return _minItems;
+ _minItems = val;
+ return combobox;
};
- features2.disable = function(k) {
- if (_rules[k] && _rules[k].enabled) {
- _rules[k].disable();
- update();
- }
+ combobox.itemsMouseEnter = function(val) {
+ if (!arguments.length) return _mouseEnterHandler;
+ _mouseEnterHandler = val;
+ return combobox;
};
- features2.disableAll = function() {
- var didDisable = false;
- for (var k in _rules) {
- if (_rules[k].enabled) {
- didDisable = true;
- _rules[k].disable();
- }
- }
- if (didDisable)
- update();
+ combobox.itemsMouseLeave = function(val) {
+ if (!arguments.length) return _mouseLeaveHandler;
+ _mouseLeaveHandler = val;
+ return combobox;
};
- features2.toggle = function(k) {
- if (_rules[k]) {
- (function(f2) {
- return f2.enabled ? f2.disable() : f2.enable();
- })(_rules[k]);
- update();
- }
+ return utilRebind(combobox, dispatch14, "on");
+ }
+ uiCombobox.off = function(input, context) {
+ input.on("focus.combo-input", null).on("blur.combo-input", null).on("keydown.combo-input", null).on("keyup.combo-input", null).on("input.combo-input", null).on("mousedown.combo-input", null).on("mouseup.combo-input", null);
+ context.container().on("scroll.combo-scroll", null);
+ };
+
+ // modules/ui/intro/helper.js
+ function pointBox(loc, context) {
+ var rect = context.surfaceRect();
+ var point = context.curtainProjection(loc);
+ return {
+ left: point[0] + rect.left - 40,
+ top: point[1] + rect.top - 60,
+ width: 80,
+ height: 90
};
- features2.resetStats = function() {
- for (var i2 = 0; i2 < _keys.length; i2++) {
- _rules[_keys[i2]].count = 0;
- }
- dispatch10.call("change");
+ }
+ function pad(locOrBox, padding, context) {
+ var box;
+ if (locOrBox instanceof Array) {
+ var rect = context.surfaceRect();
+ var point = context.curtainProjection(locOrBox);
+ box = {
+ left: point[0] + rect.left,
+ top: point[1] + rect.top
+ };
+ } else {
+ box = locOrBox;
+ }
+ return {
+ left: box.left - padding,
+ top: box.top - padding,
+ width: (box.width || 0) + 2 * padding,
+ height: (box.width || 0) + 2 * padding
};
- features2.gatherStats = function(d, resolver, dimensions) {
- var needsRedraw = false;
- var types = utilArrayGroupBy(d, "type");
- var entities = [].concat(types.relation || [], types.way || [], types.node || []);
- var currHidden, geometry, matches, i2, j2;
- for (i2 = 0; i2 < _keys.length; i2++) {
- _rules[_keys[i2]].count = 0;
+ }
+ function icon(name, svgklass, useklass) {
+ return '";
+ }
+ var helpStringReplacements;
+ function helpHtml(id2, replacements) {
+ if (!helpStringReplacements) {
+ helpStringReplacements = {
+ // insert icons corresponding to various UI elements
+ point_icon: icon("#iD-icon-point", "inline"),
+ line_icon: icon("#iD-icon-line", "inline"),
+ area_icon: icon("#iD-icon-area", "inline"),
+ note_icon: icon("#iD-icon-note", "inline add-note"),
+ plus: icon("#iD-icon-plus", "inline"),
+ minus: icon("#iD-icon-minus", "inline"),
+ layers_icon: icon("#iD-icon-layers", "inline"),
+ data_icon: icon("#iD-icon-data", "inline"),
+ inspect: icon("#iD-icon-inspect", "inline"),
+ help_icon: icon("#iD-icon-help", "inline"),
+ undo_icon: icon(_mainLocalizer.textDirection() === "rtl" ? "#iD-icon-redo" : "#iD-icon-undo", "inline"),
+ redo_icon: icon(_mainLocalizer.textDirection() === "rtl" ? "#iD-icon-undo" : "#iD-icon-redo", "inline"),
+ save_icon: icon("#iD-icon-save", "inline"),
+ // operation icons
+ circularize_icon: icon("#iD-operation-circularize", "inline operation"),
+ continue_icon: icon("#iD-operation-continue", "inline operation"),
+ copy_icon: icon("#iD-operation-copy", "inline operation"),
+ delete_icon: icon("#iD-operation-delete", "inline operation"),
+ disconnect_icon: icon("#iD-operation-disconnect", "inline operation"),
+ downgrade_icon: icon("#iD-operation-downgrade", "inline operation"),
+ extract_icon: icon("#iD-operation-extract", "inline operation"),
+ merge_icon: icon("#iD-operation-merge", "inline operation"),
+ move_icon: icon("#iD-operation-move", "inline operation"),
+ orthogonalize_icon: icon("#iD-operation-orthogonalize", "inline operation"),
+ paste_icon: icon("#iD-operation-paste", "inline operation"),
+ reflect_long_icon: icon("#iD-operation-reflect-long", "inline operation"),
+ reflect_short_icon: icon("#iD-operation-reflect-short", "inline operation"),
+ reverse_icon: icon("#iD-operation-reverse", "inline operation"),
+ rotate_icon: icon("#iD-operation-rotate", "inline operation"),
+ split_icon: icon("#iD-operation-split", "inline operation"),
+ straighten_icon: icon("#iD-operation-straighten", "inline operation"),
+ // interaction icons
+ leftclick: icon("#iD-walkthrough-mouse-left", "inline operation"),
+ rightclick: icon("#iD-walkthrough-mouse-right", "inline operation"),
+ mousewheel_icon: icon("#iD-walkthrough-mousewheel", "inline operation"),
+ tap_icon: icon("#iD-walkthrough-tap", "inline operation"),
+ doubletap_icon: icon("#iD-walkthrough-doubletap", "inline operation"),
+ longpress_icon: icon("#iD-walkthrough-longpress", "inline operation"),
+ touchdrag_icon: icon("#iD-walkthrough-touchdrag", "inline operation"),
+ pinch_icon: icon("#iD-walkthrough-pinch-apart", "inline operation"),
+ // insert keys; may be localized and platform-dependent
+ shift: uiCmd.display("\u21E7"),
+ alt: uiCmd.display("\u2325"),
+ return: uiCmd.display("\u21B5"),
+ esc: _t.html("shortcuts.key.esc"),
+ space: _t.html("shortcuts.key.space"),
+ add_note_key: _t.html("modes.add_note.key"),
+ help_key: _t.html("help.key"),
+ shortcuts_key: _t.html("shortcuts.toggle.key"),
+ // reference localized UI labels directly so that they'll always match
+ save: _t.html("save.title"),
+ undo: _t.html("undo.title"),
+ redo: _t.html("redo.title"),
+ upload: _t.html("commit.save"),
+ point: _t.html("modes.add_point.title"),
+ line: _t.html("modes.add_line.title"),
+ area: _t.html("modes.add_area.title"),
+ note: _t.html("modes.add_note.label"),
+ circularize: _t.html("operations.circularize.title"),
+ continue: _t.html("operations.continue.title"),
+ copy: _t.html("operations.copy.title"),
+ delete: _t.html("operations.delete.title"),
+ disconnect: _t.html("operations.disconnect.title"),
+ downgrade: _t.html("operations.downgrade.title"),
+ extract: _t.html("operations.extract.title"),
+ merge: _t.html("operations.merge.title"),
+ move: _t.html("operations.move.title"),
+ orthogonalize: _t.html("operations.orthogonalize.title"),
+ paste: _t.html("operations.paste.title"),
+ reflect_long: _t.html("operations.reflect.title.long"),
+ reflect_short: _t.html("operations.reflect.title.short"),
+ reverse: _t.html("operations.reverse.title"),
+ rotate: _t.html("operations.rotate.title"),
+ split: _t.html("operations.split.title"),
+ straighten: _t.html("operations.straighten.title"),
+ map_data: _t.html("map_data.title"),
+ osm_notes: _t.html("map_data.layers.notes.title"),
+ fields: _t.html("inspector.fields"),
+ tags: _t.html("inspector.tags"),
+ relations: _t.html("inspector.relations"),
+ new_relation: _t.html("inspector.new_relation"),
+ turn_restrictions: _t.html("_tagging.presets.fields.restrictions.label"),
+ background_settings: _t.html("background.description"),
+ imagery_offset: _t.html("background.fix_misalignment"),
+ start_the_walkthrough: _t.html("splash.walkthrough"),
+ help: _t.html("help.title"),
+ ok: _t.html("intro.ok")
+ };
+ for (var key in helpStringReplacements) {
+ helpStringReplacements[key] = { html: helpStringReplacements[key] };
}
- _cullFactor = dimensions[0] * dimensions[1] / 1e6;
- for (i2 = 0; i2 < entities.length; i2++) {
- geometry = entities[i2].geometry(resolver);
- matches = Object.keys(features2.getMatches(entities[i2], resolver, geometry));
- for (j2 = 0; j2 < matches.length; j2++) {
- _rules[matches[j2]].count++;
+ }
+ var reps;
+ if (replacements) {
+ reps = Object.assign(replacements, helpStringReplacements);
+ } else {
+ reps = helpStringReplacements;
+ }
+ return _t.html(id2, reps).replace(/\`(.*?)\`/g, "$1");
+ }
+ function slugify(text) {
+ return text.toString().toLowerCase().replace(/\s+/g, "-").replace(/[^\w\-]+/g, "").replace(/\-\-+/g, "-").replace(/^-+/, "").replace(/-+$/, "");
+ }
+ var missingStrings = {};
+ function checkKey(key, text) {
+ if (_t(key, { default: void 0 }) === void 0) {
+ if (missingStrings.hasOwnProperty(key)) return;
+ missingStrings[key] = text;
+ var missing = key + ": " + text;
+ if (typeof console !== "undefined") console.log(missing);
+ }
+ }
+ function localize(obj) {
+ var key;
+ var name = obj.tags && obj.tags.name;
+ if (name) {
+ key = "intro.graph.name." + slugify(name);
+ obj.tags.name = _t(key, { default: name });
+ checkKey(key, name);
+ }
+ var street = obj.tags && obj.tags["addr:street"];
+ if (street) {
+ key = "intro.graph.name." + slugify(street);
+ obj.tags["addr:street"] = _t(key, { default: street });
+ checkKey(key, street);
+ var addrTags = [
+ "block_number",
+ "city",
+ "county",
+ "district",
+ "hamlet",
+ "neighbourhood",
+ "postcode",
+ "province",
+ "quarter",
+ "state",
+ "subdistrict",
+ "suburb"
+ ];
+ addrTags.forEach(function(k2) {
+ var key2 = "intro.graph." + k2;
+ var tag2 = "addr:" + k2;
+ var val = obj.tags && obj.tags[tag2];
+ var str = _t(key2, { default: val });
+ if (str) {
+ if (str.match(/^<.*>$/) !== null) {
+ delete obj.tags[tag2];
+ } else {
+ obj.tags[tag2] = str;
+ }
}
+ });
+ }
+ return obj;
+ }
+ function isMostlySquare(points) {
+ var threshold = 15;
+ var lowerBound = Math.cos((90 - threshold) * Math.PI / 180);
+ var upperBound = Math.cos(threshold * Math.PI / 180);
+ for (var i3 = 0; i3 < points.length; i3++) {
+ var a2 = points[(i3 - 1 + points.length) % points.length];
+ var origin = points[i3];
+ var b2 = points[(i3 + 1) % points.length];
+ var dotp = geoVecNormalizedDot(a2, b2, origin);
+ var mag = Math.abs(dotp);
+ if (mag > lowerBound && mag < upperBound) {
+ return false;
}
- currHidden = features2.hidden();
- if (currHidden !== _hidden) {
- _hidden = currHidden;
- needsRedraw = true;
- dispatch10.call("change");
- }
- return needsRedraw;
+ }
+ return true;
+ }
+ function selectMenuItem(context, operation2) {
+ return context.container().select(".edit-menu .edit-menu-item-" + operation2);
+ }
+ function transitionTime(point1, point2) {
+ var distance = geoSphericalDistance(point1, point2);
+ if (distance === 0) {
+ return 0;
+ } else if (distance < 80) {
+ return 500;
+ } else {
+ return 1e3;
+ }
+ }
+
+ // modules/ui/field_help.js
+ function uiFieldHelp(context, fieldName) {
+ var fieldHelp = {};
+ var _inspector = select_default2(null);
+ var _wrap = select_default2(null);
+ var _body = select_default2(null);
+ var fieldHelpKeys = {
+ restrictions: [
+ ["about", [
+ "about",
+ "from_via_to",
+ "maxdist",
+ "maxvia"
+ ]],
+ ["inspecting", [
+ "about",
+ "from_shadow",
+ "allow_shadow",
+ "restrict_shadow",
+ "only_shadow",
+ "restricted",
+ "only"
+ ]],
+ ["modifying", [
+ "about",
+ "indicators",
+ "allow_turn",
+ "restrict_turn",
+ "only_turn"
+ ]],
+ ["tips", [
+ "simple",
+ "simple_example",
+ "indirect",
+ "indirect_example",
+ "indirect_noedit"
+ ]]
+ ]
};
- features2.stats = function() {
- for (var i2 = 0; i2 < _keys.length; i2++) {
- _stats[_keys[i2]] = _rules[_keys[i2]].count;
- }
- return _stats;
+ var fieldHelpHeadings = {};
+ var replacements = {
+ distField: { html: _t.html("restriction.controls.distance") },
+ viaField: { html: _t.html("restriction.controls.via") },
+ fromShadow: { html: icon("#iD-turn-shadow", "inline shadow from") },
+ allowShadow: { html: icon("#iD-turn-shadow", "inline shadow allow") },
+ restrictShadow: { html: icon("#iD-turn-shadow", "inline shadow restrict") },
+ onlyShadow: { html: icon("#iD-turn-shadow", "inline shadow only") },
+ allowTurn: { html: icon("#iD-turn-yes", "inline turn") },
+ restrictTurn: { html: icon("#iD-turn-no", "inline turn") },
+ onlyTurn: { html: icon("#iD-turn-only", "inline turn") }
};
- features2.clear = function(d) {
- for (var i2 = 0; i2 < d.length; i2++) {
- features2.clearEntity(d[i2]);
+ var docs = fieldHelpKeys[fieldName].map(function(key) {
+ var helpkey = "help.field." + fieldName + "." + key[0];
+ var text = key[1].reduce(function(all, part) {
+ var subkey = helpkey + "." + part;
+ var depth = fieldHelpHeadings[subkey];
+ var hhh = depth ? Array(depth + 1).join("#") + " " : "";
+ return all + hhh + _t.html(subkey, replacements) + "\n\n";
+ }, "");
+ return {
+ key: helpkey,
+ title: _t.html(helpkey + ".title"),
+ html: marked(text.trim())
+ };
+ });
+ function show() {
+ updatePosition();
+ _body.classed("hide", false).style("opacity", "0").transition().duration(200).style("opacity", "1");
+ }
+ function hide() {
+ _body.classed("hide", true).transition().duration(200).style("opacity", "0").on("end", function() {
+ _body.classed("hide", true);
+ });
+ }
+ function clickHelp(index) {
+ var d2 = docs[index];
+ var tkeys = fieldHelpKeys[fieldName][index][1];
+ _body.selectAll(".field-help-nav-item").classed("active", function(d4, i3) {
+ return i3 === index;
+ });
+ var content = _body.selectAll(".field-help-content").html(d2.html);
+ content.selectAll("p").attr("class", function(d4, i3) {
+ return tkeys[i3];
+ });
+ if (d2.key === "help.field.restrictions.inspecting") {
+ content.insert("img", "p.from_shadow").attr("class", "field-help-image cf").attr("src", context.imagePath("tr_inspect.gif"));
+ } else if (d2.key === "help.field.restrictions.modifying") {
+ content.insert("img", "p.allow_turn").attr("class", "field-help-image cf").attr("src", context.imagePath("tr_modify.gif"));
}
+ }
+ fieldHelp.button = function(selection2) {
+ if (_body.empty()) return;
+ var button = selection2.selectAll(".field-help-button").data([0]);
+ button.enter().append("button").attr("class", "field-help-button").call(svgIcon("#iD-icon-help")).merge(button).on("click", function(d3_event) {
+ d3_event.stopPropagation();
+ d3_event.preventDefault();
+ if (_body.classed("hide")) {
+ show();
+ } else {
+ hide();
+ }
+ });
};
- features2.clearEntity = function(entity) {
- delete _cache4[osmEntity.key(entity)];
- };
- features2.reset = function() {
- Array.from(_deferred2).forEach(function(handle) {
- window.cancelIdleCallback(handle);
- _deferred2.delete(handle);
+ function updatePosition() {
+ var wrap2 = _wrap.node();
+ var inspector = _inspector.node();
+ var wRect = wrap2.getBoundingClientRect();
+ var iRect = inspector.getBoundingClientRect();
+ _body.style("top", wRect.top + inspector.scrollTop - iRect.top + "px");
+ }
+ fieldHelp.body = function(selection2) {
+ _wrap = selection2.selectAll(".form-field-input-wrap");
+ if (_wrap.empty()) return;
+ _inspector = context.container().select(".sidebar .entity-editor-pane .inspector-body");
+ if (_inspector.empty()) return;
+ _body = _inspector.selectAll(".field-help-body").data([0]);
+ var enter = _body.enter().append("div").attr("class", "field-help-body hide");
+ var titleEnter = enter.append("div").attr("class", "field-help-title cf");
+ titleEnter.append("h2").attr("class", _mainLocalizer.textDirection() === "rtl" ? "fr" : "fl").call(_t.append("help.field." + fieldName + ".title"));
+ titleEnter.append("button").attr("class", "fr close").attr("title", _t("icons.close")).on("click", function(d3_event) {
+ d3_event.stopPropagation();
+ d3_event.preventDefault();
+ hide();
+ }).call(svgIcon("#iD-icon-close"));
+ var navEnter = enter.append("div").attr("class", "field-help-nav cf");
+ var titles = docs.map(function(d2) {
+ return d2.title;
});
- _cache4 = {};
+ navEnter.selectAll(".field-help-nav-item").data(titles).enter().append("div").attr("class", "field-help-nav-item").html(function(d2) {
+ return d2;
+ }).on("click", function(d3_event, d2) {
+ d3_event.stopPropagation();
+ d3_event.preventDefault();
+ clickHelp(titles.indexOf(d2));
+ });
+ enter.append("div").attr("class", "field-help-content");
+ _body = _body.merge(enter);
+ clickHelp(0);
};
- function relationShouldBeChecked(relation) {
- return relation.tags.type === "boundary";
+ return fieldHelp;
+ }
+
+ // modules/ui/fields/check.js
+ function uiFieldCheck(field, context) {
+ var dispatch14 = dispatch_default("change");
+ var options2 = field.options;
+ var values = [];
+ var texts = [];
+ var _tags;
+ var input = select_default2(null);
+ var text = select_default2(null);
+ var label = select_default2(null);
+ var reverser = select_default2(null);
+ var _impliedYes;
+ var _entityIDs = [];
+ var _value;
+ var stringsField = field.resolveReference("stringsCrossReference");
+ if (!options2 && stringsField.options) {
+ options2 = stringsField.options;
}
- features2.getMatches = function(entity, resolver, geometry) {
- if (geometry === "vertex" || geometry === "relation" && !relationShouldBeChecked(entity))
- return {};
- var ent = osmEntity.key(entity);
- if (!_cache4[ent]) {
- _cache4[ent] = {};
+ if (options2) {
+ for (var i3 in options2) {
+ var v2 = options2[i3];
+ values.push(v2 === "undefined" ? void 0 : v2);
+ texts.push(stringsField.t.html("options." + v2, { "default": v2 }));
}
- if (!_cache4[ent].matches) {
- var matches = {};
- var hasMatch = false;
- for (var i2 = 0; i2 < _keys.length; i2++) {
- if (_keys[i2] === "others") {
- if (hasMatch)
- continue;
- if (entity.type === "way") {
- var parents = features2.getParents(entity, resolver, geometry);
- if (parents.length === 1 && parents[0].isMultipolygon() || parents.length > 0 && parents.every(function(parent) {
- return parent.tags.type === "boundary";
- })) {
- var pkey = osmEntity.key(parents[0]);
- if (_cache4[pkey] && _cache4[pkey].matches) {
- matches = Object.assign({}, _cache4[pkey].matches);
- continue;
- }
- }
- }
- }
- if (_rules[_keys[i2]].filter(entity.tags, geometry)) {
- matches[_keys[i2]] = hasMatch = true;
+ } else {
+ values = [void 0, "yes"];
+ texts = [_t.html("inspector.unknown"), _t.html("inspector.check.yes")];
+ if (field.type !== "defaultCheck") {
+ values.push("no");
+ texts.push(_t.html("inspector.check.no"));
+ }
+ }
+ function checkImpliedYes() {
+ _impliedYes = field.id === "oneway_yes";
+ if (field.id === "oneway") {
+ var entity = context.entity(_entityIDs[0]);
+ for (var key in entity.tags) {
+ if (key in osmOneWayTags && entity.tags[key] in osmOneWayTags[key]) {
+ _impliedYes = true;
+ texts[0] = _t.html("_tagging.presets.fields.oneway_yes.options.undefined");
+ break;
}
}
- _cache4[ent].matches = matches;
}
- return _cache4[ent].matches;
- };
- features2.getParents = function(entity, resolver, geometry) {
- if (geometry === "point")
- return [];
- var ent = osmEntity.key(entity);
- if (!_cache4[ent]) {
- _cache4[ent] = {};
+ }
+ function reverserHidden() {
+ if (!context.container().select("div.inspector-hover").empty()) return true;
+ return !(_value === "yes" || _impliedYes && !_value);
+ }
+ function reverserSetText(selection2) {
+ var entity = _entityIDs.length && context.hasEntity(_entityIDs[0]);
+ if (reverserHidden() || !entity) return selection2;
+ var first = entity.first();
+ var last = entity.isClosed() ? entity.nodes[entity.nodes.length - 2] : entity.last();
+ var pseudoDirection = first < last;
+ var icon2 = pseudoDirection ? "#iD-icon-forward" : "#iD-icon-backward";
+ selection2.selectAll(".reverser-span").html("").call(_t.append("inspector.check.reverser")).call(svgIcon(icon2, "inline"));
+ return selection2;
+ }
+ var check = function(selection2) {
+ checkImpliedYes();
+ label = selection2.selectAll(".form-field-input-wrap").data([0]);
+ var enter = label.enter().append("label").attr("class", "form-field-input-wrap form-field-input-check");
+ enter.append("input").property("indeterminate", field.type !== "defaultCheck").attr("type", "checkbox").attr("id", field.domId);
+ enter.append("span").html(texts[0]).attr("class", "value");
+ if (field.type === "onewayCheck") {
+ enter.append("button").attr("class", "reverser" + (reverserHidden() ? " hide" : "")).append("span").attr("class", "reverser-span");
}
- if (!_cache4[ent].parents) {
- var parents = [];
- if (geometry === "vertex") {
- parents = resolver.parentWays(entity);
+ label = label.merge(enter);
+ input = label.selectAll("input");
+ text = label.selectAll("span.value");
+ input.on("click", function(d3_event) {
+ d3_event.stopPropagation();
+ var t2 = {};
+ if (Array.isArray(_tags[field.key])) {
+ if (values.indexOf("yes") !== -1) {
+ t2[field.key] = "yes";
+ } else {
+ t2[field.key] = values[0];
+ }
} else {
- parents = resolver.parentRelations(entity);
+ t2[field.key] = values[(values.indexOf(_value) + 1) % values.length];
}
- _cache4[ent].parents = parents;
- }
- return _cache4[ent].parents;
- };
- features2.isHiddenPreset = function(preset, geometry) {
- if (!_hidden.length)
- return false;
- if (!preset.tags)
- return false;
- var test = preset.setTags({}, geometry);
- for (var key in _rules) {
- if (_rules[key].filter(test, geometry)) {
- if (_hidden.indexOf(key) !== -1) {
- return key;
- }
- return false;
+ if (t2[field.key] === "reversible" || t2[field.key] === "alternating") {
+ t2[field.key] = values[0];
}
- }
- return false;
- };
- features2.isHiddenFeature = function(entity, resolver, geometry) {
- if (!_hidden.length)
- return false;
- if (!entity.version)
- return false;
- if (_forceVisible[entity.id])
- return false;
- var matches = Object.keys(features2.getMatches(entity, resolver, geometry));
- return matches.length && matches.every(function(k) {
- return features2.hidden(k);
+ dispatch14.call("change", this, t2);
});
- };
- features2.isHiddenChild = function(entity, resolver, geometry) {
- if (!_hidden.length)
- return false;
- if (!entity.version || geometry === "point")
- return false;
- if (_forceVisible[entity.id])
- return false;
- var parents = features2.getParents(entity, resolver, geometry);
- if (!parents.length)
- return false;
- for (var i2 = 0; i2 < parents.length; i2++) {
- if (!features2.isHidden(parents[i2], resolver, parents[i2].geometry(resolver))) {
- return false;
- }
- }
- return true;
- };
- features2.hasHiddenConnections = function(entity, resolver) {
- if (!_hidden.length)
- return false;
- var childNodes, connections;
- if (entity.type === "midpoint") {
- childNodes = [resolver.entity(entity.edge[0]), resolver.entity(entity.edge[1])];
- connections = [];
- } else {
- childNodes = entity.nodes ? resolver.childNodes(entity) : [];
- connections = features2.getParents(entity, resolver, entity.geometry(resolver));
+ if (field.type === "onewayCheck") {
+ reverser = label.selectAll(".reverser");
+ reverser.call(reverserSetText).on("click", function(d3_event) {
+ d3_event.preventDefault();
+ d3_event.stopPropagation();
+ context.perform(
+ function(graph) {
+ for (var i4 in _entityIDs) {
+ graph = actionReverse(_entityIDs[i4])(graph);
+ }
+ return graph;
+ },
+ _t("operations.reverse.annotation.line", { n: 1 })
+ );
+ context.validator().validate();
+ select_default2(this).call(reverserSetText);
+ });
}
- connections = childNodes.reduce(function(result, e) {
- return resolver.isShared(e) ? utilArrayUnion(result, resolver.parentWays(e)) : result;
- }, connections);
- return connections.some(function(e) {
- return features2.isHidden(e, resolver, e.geometry(resolver));
- });
};
- features2.isHidden = function(entity, resolver, geometry) {
- if (!_hidden.length)
- return false;
- if (!entity.version)
- return false;
- var fn = geometry === "vertex" ? features2.isHiddenChild : features2.isHiddenFeature;
- return fn(entity, resolver, geometry);
+ check.entityIDs = function(val) {
+ if (!arguments.length) return _entityIDs;
+ _entityIDs = val;
+ return check;
};
- features2.filter = function(d, resolver) {
- if (!_hidden.length)
- return d;
- var result = [];
- for (var i2 = 0; i2 < d.length; i2++) {
- var entity = d[i2];
- if (!features2.isHidden(entity, resolver, entity.geometry(resolver))) {
- result.push(entity);
- }
+ check.tags = function(tags) {
+ _tags = tags;
+ function isChecked(val) {
+ return val !== "no" && val !== "" && val !== void 0 && val !== null;
}
- return result;
- };
- features2.forceVisible = function(entityIDs) {
- if (!arguments.length)
- return Object.keys(_forceVisible);
- _forceVisible = {};
- for (var i2 = 0; i2 < entityIDs.length; i2++) {
- _forceVisible[entityIDs[i2]] = true;
- var entity = context.hasEntity(entityIDs[i2]);
- if (entity && entity.type === "relation") {
- for (var j2 in entity.members) {
- _forceVisible[entity.members[j2].id] = true;
- }
- }
+ function textFor(val) {
+ if (val === "") val = void 0;
+ var index = values.indexOf(val);
+ return index !== -1 ? texts[index] : '"' + val + '"';
}
- return features2;
- };
- features2.init = function() {
- var storage = corePreferences("disabled-features");
- if (storage) {
- var storageDisabled = storage.replace(/;/g, ",").split(",");
- storageDisabled.forEach(features2.disable);
+ checkImpliedYes();
+ var isMixed = Array.isArray(tags[field.key]);
+ _value = !isMixed && tags[field.key] && tags[field.key].toLowerCase();
+ if (field.type === "onewayCheck" && (_value === "1" || _value === "-1")) {
+ _value = "yes";
}
- var hash = utilStringQs(window.location.hash);
- if (hash.disable_features) {
- var hashDisabled = hash.disable_features.replace(/;/g, ",").split(",");
- hashDisabled.forEach(features2.disable);
+ input.property("indeterminate", isMixed || field.type !== "defaultCheck" && !_value).property("checked", isChecked(_value));
+ text.html(isMixed ? _t.html("inspector.multiple_values") : textFor(_value)).classed("mixed", isMixed);
+ label.classed("set", !!_value);
+ if (field.type === "onewayCheck") {
+ reverser.classed("hide", reverserHidden()).call(reverserSetText);
}
};
- context.history().on("merge.features", function(newEntities) {
- if (!newEntities)
- return;
- var handle = window.requestIdleCallback(function() {
- var graph = context.graph();
- var types = utilArrayGroupBy(newEntities, "type");
- var entities = [].concat(types.relation || [], types.way || [], types.node || []);
- for (var i2 = 0; i2 < entities.length; i2++) {
- var geometry = entities[i2].geometry(graph);
- features2.getMatches(entities[i2], graph, geometry);
- }
- });
- _deferred2.add(handle);
- });
- return features2;
+ check.focus = function() {
+ input.node().focus();
+ };
+ return utilRebind(check, dispatch14, "on");
}
// modules/svg/areas.js
@@ -44508,15 +48337,13 @@ ${content}
// modules/svg/helpers.js
function svgPassiveVertex(node, graph, activeID) {
- if (!activeID)
- return 1;
- if (activeID === node.id)
- return 0;
+ if (!activeID) return 1;
+ if (activeID === node.id) return 0;
var parents = graph.parentWays(node);
- var i2, j2, nodes, isClosed, ix1, ix2, ix3, ix4, max3;
- for (i2 = 0; i2 < parents.length; i2++) {
- nodes = parents[i2].nodes;
- isClosed = parents[i2].isClosed();
+ var i3, j2, nodes, isClosed, ix1, ix2, ix3, ix4, max3;
+ for (i3 = 0; i3 < parents.length; i3++) {
+ nodes = parents[i3].nodes;
+ isClosed = parents[i3].isClosed();
for (j2 = 0; j2 < nodes.length; j2++) {
if (nodes[j2] === node.id) {
ix1 = j2 - 2;
@@ -44525,40 +48352,31 @@ ${content}
ix4 = j2 + 2;
if (isClosed) {
max3 = nodes.length - 1;
- if (ix1 < 0)
- ix1 = max3 + ix1;
- if (ix2 < 0)
- ix2 = max3 + ix2;
- if (ix3 > max3)
- ix3 = ix3 - max3;
- if (ix4 > max3)
- ix4 = ix4 - max3;
- }
- if (nodes[ix1] === activeID)
- return 0;
- else if (nodes[ix2] === activeID)
- return 2;
- else if (nodes[ix3] === activeID)
- return 2;
- else if (nodes[ix4] === activeID)
- return 0;
- else if (isClosed && nodes.indexOf(activeID) !== -1)
- return 0;
+ if (ix1 < 0) ix1 = max3 + ix1;
+ if (ix2 < 0) ix2 = max3 + ix2;
+ if (ix3 > max3) ix3 = ix3 - max3;
+ if (ix4 > max3) ix4 = ix4 - max3;
+ }
+ if (nodes[ix1] === activeID) return 0;
+ else if (nodes[ix2] === activeID) return 2;
+ else if (nodes[ix3] === activeID) return 2;
+ else if (nodes[ix4] === activeID) return 0;
+ else if (isClosed && nodes.indexOf(activeID) !== -1) return 0;
}
}
}
return 1;
}
- function svgMarkerSegments(projection2, graph, dt, shouldReverse, bothDirections) {
+ function svgMarkerSegments(projection2, graph, dt2, shouldReverse, bothDirections) {
return function(entity) {
- var i2 = 0;
- var offset = dt;
+ var i3 = 0;
+ var offset = dt2;
var segments = [];
var clip = identity_default2().clipExtent(projection2.clipExtent()).stream;
- var coordinates = graph.childNodes(entity).map(function(n2) {
- return n2.loc;
+ var coordinates = graph.childNodes(entity).map(function(n3) {
+ return n3.loc;
});
- var a, b;
+ var a2, b2;
if (shouldReverse(entity)) {
coordinates.reverse();
}
@@ -44569,43 +48387,43 @@ ${content}
lineStart: function() {
},
lineEnd: function() {
- a = null;
+ a2 = null;
},
- point: function(x, y) {
- b = [x, y];
- if (a) {
- var span = geoVecLength(a, b) - offset;
+ point: function(x2, y2) {
+ b2 = [x2, y2];
+ if (a2) {
+ var span = geoVecLength(a2, b2) - offset;
if (span >= 0) {
- var heading = geoVecAngle(a, b);
- var dx = dt * Math.cos(heading);
- var dy = dt * Math.sin(heading);
- var p = [
- a[0] + offset * Math.cos(heading),
- a[1] + offset * Math.sin(heading)
+ var heading2 = geoVecAngle(a2, b2);
+ var dx = dt2 * Math.cos(heading2);
+ var dy = dt2 * Math.sin(heading2);
+ var p2 = [
+ a2[0] + offset * Math.cos(heading2),
+ a2[1] + offset * Math.sin(heading2)
];
- var coord2 = [a, p];
- for (span -= dt; span >= 0; span -= dt) {
- p = geoVecAdd(p, [dx, dy]);
- coord2.push(p);
+ var coord2 = [a2, p2];
+ for (span -= dt2; span >= 0; span -= dt2) {
+ p2 = geoVecAdd(p2, [dx, dy]);
+ coord2.push(p2);
}
- coord2.push(b);
+ coord2.push(b2);
var segment = "";
var j2;
for (j2 = 0; j2 < coord2.length; j2++) {
segment += (j2 === 0 ? "M" : "L") + coord2[j2][0] + "," + coord2[j2][1];
}
- segments.push({ id: entity.id, index: i2++, d: segment });
+ segments.push({ id: entity.id, index: i3++, d: segment });
if (bothDirections(entity)) {
segment = "";
for (j2 = coord2.length - 1; j2 >= 0; j2--) {
segment += (j2 === coord2.length - 1 ? "M" : "L") + coord2[j2][0] + "," + coord2[j2][1];
}
- segments.push({ id: entity.id, index: i2++, d: segment });
+ segments.push({ id: entity.id, index: i3++, d: segment });
}
}
offset = -span;
}
- a = b;
+ a2 = b2;
}
})));
return segments;
@@ -44631,26 +48449,26 @@ ${content}
return cache[entity.id] = path(entity.asGeoJSON(graph));
}
};
- svgpath.geojson = function(d) {
- if (d.__featurehash__ !== void 0) {
- if (d.__featurehash__ in cache) {
- return cache[d.__featurehash__];
+ svgpath.geojson = function(d2) {
+ if (d2.__featurehash__ !== void 0) {
+ if (d2.__featurehash__ in cache) {
+ return cache[d2.__featurehash__];
} else {
- return cache[d.__featurehash__] = path(d);
+ return cache[d2.__featurehash__] = path(d2);
}
} else {
- return path(d);
+ return path(d2);
}
};
return svgpath;
}
function svgPointTransform(projection2) {
var svgpoint = function(entity) {
- var pt = projection2(entity.loc);
- return "translate(" + pt[0] + "," + pt[1] + ")";
+ var pt2 = projection2(entity.loc);
+ return "translate(" + pt2[0] + "," + pt2[1] + ")";
};
- svgpoint.geojson = function(d) {
- return svgpoint(d.properties.entity);
+ svgpoint.geojson = function(d2) {
+ return svgpoint(d2.properties.entity);
};
return svgpoint;
}
@@ -44659,8 +48477,8 @@ ${content}
var tags = entity.tags;
var shouldCopyMultipolygonTags = !entity.hasInterestingTags();
graph.parentRelations(entity).forEach(function(relation) {
- var type3 = relation.tags.type;
- if (type3 === "multipolygon" && shouldCopyMultipolygonTags || type3 === "boundary") {
+ var type2 = relation.tags.type;
+ if (type2 === "multipolygon" && shouldCopyMultipolygonTags || type2 === "boundary") {
tags = Object.assign({}, relation.tags, tags);
}
});
@@ -44675,29 +48493,29 @@ ${content}
}
function getWaySegments() {
var isActiveWay = way.nodes.indexOf(activeID) !== -1;
- var features2 = { passive: [], active: [] };
+ var features = { passive: [], active: [] };
var start2 = {};
var end = {};
- var node, type3;
- for (var i2 = 0; i2 < way.nodes.length; i2++) {
- node = graph.entity(way.nodes[i2]);
- type3 = svgPassiveVertex(node, graph, activeID);
- end = { node, type: type3 };
+ var node, type2;
+ for (var i3 = 0; i3 < way.nodes.length; i3++) {
+ node = graph.entity(way.nodes[i3]);
+ type2 = svgPassiveVertex(node, graph, activeID);
+ end = { node, type: type2 };
if (start2.type !== void 0) {
if (start2.node.id === activeID || end.node.id === activeID) {
} else if (isActiveWay && (start2.type === 2 || end.type === 2)) {
- pushActive(start2, end, i2);
+ pushActive(start2, end, i3);
} else if (start2.type === 0 && end.type === 0) {
- pushActive(start2, end, i2);
+ pushActive(start2, end, i3);
} else {
- pushPassive(start2, end, i2);
+ pushPassive(start2, end, i3);
}
}
start2 = end;
}
- return features2;
+ return features;
function pushActive(start3, end2, index) {
- features2.active.push({
+ features.active.push({
type: "Feature",
id: way.id + "-" + index + "-nope",
properties: {
@@ -44714,7 +48532,7 @@ ${content}
});
}
function pushPassive(start3, end2, index) {
- features2.passive.push({
+ features.passive.push({
type: "Feature",
id: way.id + "-" + index,
properties: {
@@ -44753,21 +48571,11 @@ ${content}
"man_made",
"route",
"attraction",
+ "roller_coaster",
"building:part",
"indoor"
];
- var statuses = [
- "proposed",
- "planned",
- "construction",
- "disused",
- "abandoned",
- "dismantled",
- "razed",
- "demolished",
- "obliterated",
- "intermittent"
- ];
+ var statuses = Object.keys(osmLifecyclePrefixes);
var secondaries = [
"oneway",
"bridge",
@@ -44801,19 +48609,19 @@ ${content}
if (value.baseVal !== void 0) {
value = value.baseVal;
}
- var t = _tags(entity);
- var computed = tagClasses.getClassesString(t, value);
+ var t2 = _tags(entity);
+ var computed = tagClasses.getClassesString(t2, value);
if (computed !== value) {
select_default2(this).attr("class", computed);
}
});
};
- tagClasses.getClassesString = function(t, value) {
+ tagClasses.getClassesString = function(t2, value) {
var primary, status;
- var i2, j2, k, v;
+ var i3, j2, k2, v2;
var overrideGeometry;
if (/\bstroke\b/.test(value)) {
- if (!!t.barrier && t.barrier !== "no") {
+ if (!!t2.barrier && t2.barrier !== "no") {
overrideGeometry = "line";
}
}
@@ -44822,91 +48630,85 @@ ${content}
}).map(function(klass) {
return klass === "line" || klass === "area" ? overrideGeometry || klass : klass;
});
- for (i2 = 0; i2 < primaries.length; i2++) {
- k = primaries[i2];
- v = t[k];
- if (!v || v === "no")
- continue;
- if (k === "piste:type") {
- k = "piste";
- } else if (k === "building:part") {
- k = "building_part";
- }
- primary = k;
- if (statuses.indexOf(v) !== -1) {
- status = v;
- classes.push("tag-" + k);
+ for (i3 = 0; i3 < primaries.length; i3++) {
+ k2 = primaries[i3];
+ v2 = t2[k2];
+ if (!v2 || v2 === "no") continue;
+ if (k2 === "piste:type") {
+ k2 = "piste";
+ } else if (k2 === "building:part") {
+ k2 = "building_part";
+ }
+ primary = k2;
+ if (statuses.indexOf(v2) !== -1) {
+ status = v2;
+ classes.push("tag-" + k2);
} else {
- classes.push("tag-" + k);
- classes.push("tag-" + k + "-" + v);
+ classes.push("tag-" + k2);
+ classes.push("tag-" + k2 + "-" + v2);
}
break;
}
if (!primary) {
- for (i2 = 0; i2 < statuses.length; i2++) {
+ for (i3 = 0; i3 < statuses.length; i3++) {
for (j2 = 0; j2 < primaries.length; j2++) {
- k = statuses[i2] + ":" + primaries[j2];
- v = t[k];
- if (!v || v === "no")
- continue;
- status = statuses[i2];
+ k2 = statuses[i3] + ":" + primaries[j2];
+ v2 = t2[k2];
+ if (!v2 || v2 === "no") continue;
+ status = statuses[i3];
break;
}
}
}
if (!status) {
- for (i2 = 0; i2 < statuses.length; i2++) {
- k = statuses[i2];
- v = t[k];
- if (!v || v === "no")
- continue;
- if (v === "yes") {
- status = k;
- } else if (primary && primary === v) {
- status = k;
- } else if (!primary && primaries.indexOf(v) !== -1) {
- status = k;
- primary = v;
- classes.push("tag-" + v);
- }
- if (status)
- break;
+ for (i3 = 0; i3 < statuses.length; i3++) {
+ k2 = statuses[i3];
+ v2 = t2[k2];
+ if (!v2 || v2 === "no") continue;
+ if (v2 === "yes") {
+ status = k2;
+ } else if (primary && primary === v2) {
+ status = k2;
+ } else if (!primary && primaries.indexOf(v2) !== -1) {
+ status = k2;
+ primary = v2;
+ classes.push("tag-" + v2);
+ }
+ if (status) break;
}
}
if (status) {
classes.push("tag-status");
classes.push("tag-status-" + status);
}
- for (i2 = 0; i2 < secondaries.length; i2++) {
- k = secondaries[i2];
- v = t[k];
- if (!v || v === "no" || k === primary)
- continue;
- classes.push("tag-" + k);
- classes.push("tag-" + k + "-" + v);
- }
- if (primary === "highway" && !osmPathHighwayTagValues[t.highway] || primary === "aeroway") {
- var surface = t.highway === "track" ? "unpaved" : "paved";
- for (k in t) {
- v = t[k];
- if (k in osmPavedTags) {
- surface = osmPavedTags[k][v] ? "paved" : "unpaved";
- }
- if (k in osmSemipavedTags && !!osmSemipavedTags[k][v]) {
+ for (i3 = 0; i3 < secondaries.length; i3++) {
+ k2 = secondaries[i3];
+ v2 = t2[k2];
+ if (!v2 || v2 === "no" || k2 === primary) continue;
+ classes.push("tag-" + k2);
+ classes.push("tag-" + k2 + "-" + v2);
+ }
+ if (primary === "highway" && !osmPathHighwayTagValues[t2.highway] || primary === "aeroway") {
+ var surface = t2.highway === "track" ? "unpaved" : "paved";
+ for (k2 in t2) {
+ v2 = t2[k2];
+ if (k2 in osmPavedTags) {
+ surface = osmPavedTags[k2][v2] ? "paved" : "unpaved";
+ }
+ if (k2 in osmSemipavedTags && !!osmSemipavedTags[k2][v2]) {
surface = "semipaved";
}
}
classes.push("tag-" + surface);
}
- var qid = t.wikidata || t["flag:wikidata"] || t["brand:wikidata"] || t["network:wikidata"] || t["operator:wikidata"];
+ var qid = t2.wikidata || t2["flag:wikidata"] || t2["brand:wikidata"] || t2["network:wikidata"] || t2["operator:wikidata"];
if (qid) {
classes.push("tag-wikidata");
}
- return classes.join(" ").trim();
+ return classes.filter((klass) => /^[-_a-z0-9]+$/.test(klass)).join(" ").trim();
};
tagClasses.tags = function(val) {
- if (!arguments.length)
- return _tags;
+ if (!arguments.length) return _tags;
_tags = val;
return tagClasses;
};
@@ -44915,6 +48717,12 @@ ${content}
// modules/svg/tag_pattern.js
var patterns = {
+ // tag - pattern name
+ // -or-
+ // tag - value - pattern name
+ // -or-
+ // tag - value - rules (optional tag-values, pattern name)
+ // (matches earlier rules first, so fallback should be last entry)
amenity: {
grave_yard: "cemetery",
fountain: "water_standing"
@@ -44935,6 +48743,7 @@ ${content}
{ leaf_type: "needleleaved", pattern: "forest_needleleaved" },
{ leaf_type: "leafless", pattern: "forest_leafless" },
{ pattern: "forest" }
+ // same as 'leaf_type:mixed'
],
grave_yard: "cemetery",
grass: "grass",
@@ -44970,6 +48779,7 @@ ${content}
{ leaf_type: "needleleaved", pattern: "forest_needleleaved" },
{ leaf_type: "leafless", pattern: "forest_leafless" },
{ pattern: "forest" }
+ // same as 'leaf_type:mixed'
]
},
golf: {
@@ -44987,17 +48797,15 @@ ${content}
if (tags.building && tags.building !== "no") {
return null;
}
- for (var tag in patterns) {
- var entityValue = tags[tag];
- if (!entityValue)
- continue;
- if (typeof patterns[tag] === "string") {
- return "pattern-" + patterns[tag];
+ for (var tag2 in patterns) {
+ var entityValue = tags[tag2];
+ if (!entityValue) continue;
+ if (typeof patterns[tag2] === "string") {
+ return "pattern-" + patterns[tag2];
} else {
- var values = patterns[tag];
+ var values = patterns[tag2];
for (var value in values) {
- if (entityValue !== value)
- continue;
+ if (entityValue !== value) continue;
var rules = values[value];
if (typeof rules === "string") {
return "pattern-" + rules;
@@ -45007,8 +48815,8 @@ ${content}
var pass = true;
for (var criterion in rule) {
if (criterion !== "pattern") {
- var v = tags[criterion];
- if (!v || v !== rule[criterion]) {
+ var v2 = tags[criterion];
+ if (!v2 || v2 !== rule[criterion]) {
pass = false;
break;
}
@@ -45041,70 +48849,62 @@ ${content}
var base = context.history().base();
var data = { targets: [], nopes: [] };
entities.forEach(function(way) {
- var features2 = svgSegmentWay(way, graph, activeID);
- data.targets.push.apply(data.targets, features2.passive);
- data.nopes.push.apply(data.nopes, features2.active);
+ var features = svgSegmentWay(way, graph, activeID);
+ data.targets.push.apply(data.targets, features.passive);
+ data.nopes.push.apply(data.nopes, features.active);
});
var targetData = data.targets.filter(getPath);
- var targets = selection2.selectAll(".area.target-allowed").filter(function(d) {
- return filter2(d.properties.entity);
- }).data(targetData, function key(d) {
- return d.id;
+ var targets = selection2.selectAll(".area.target-allowed").filter(function(d2) {
+ return filter2(d2.properties.entity);
+ }).data(targetData, function key(d2) {
+ return d2.id;
});
targets.exit().remove();
- var segmentWasEdited = function(d) {
- var wayID = d.properties.entity.id;
+ var segmentWasEdited = function(d2) {
+ var wayID = d2.properties.entity.id;
if (!base.entities[wayID] || !(0, import_fast_deep_equal5.default)(graph.entities[wayID].nodes, base.entities[wayID].nodes)) {
return false;
}
- return d.properties.nodes.some(function(n2) {
- return !base.entities[n2.id] || !(0, import_fast_deep_equal5.default)(graph.entities[n2.id].loc, base.entities[n2.id].loc);
+ return d2.properties.nodes.some(function(n3) {
+ return !base.entities[n3.id] || !(0, import_fast_deep_equal5.default)(graph.entities[n3.id].loc, base.entities[n3.id].loc);
});
};
- targets.enter().append("path").merge(targets).attr("d", getPath).attr("class", function(d) {
- return "way area target target-allowed " + targetClass + d.id;
+ targets.enter().append("path").merge(targets).attr("d", getPath).attr("class", function(d2) {
+ return "way area target target-allowed " + targetClass + d2.id;
}).classed("segment-edited", segmentWasEdited);
var nopeData = data.nopes.filter(getPath);
- var nopes = selection2.selectAll(".area.target-nope").filter(function(d) {
- return filter2(d.properties.entity);
- }).data(nopeData, function key(d) {
- return d.id;
+ var nopes = selection2.selectAll(".area.target-nope").filter(function(d2) {
+ return filter2(d2.properties.entity);
+ }).data(nopeData, function key(d2) {
+ return d2.id;
});
nopes.exit().remove();
- nopes.enter().append("path").merge(nopes).attr("d", getPath).attr("class", function(d) {
- return "way area target target-nope " + nopeClass + d.id;
+ nopes.enter().append("path").merge(nopes).attr("d", getPath).attr("class", function(d2) {
+ return "way area target target-nope " + nopeClass + d2.id;
}).classed("segment-edited", segmentWasEdited);
}
function drawAreas(selection2, graph, entities, filter2) {
var path = svgPath(projection2, graph, true);
var areas = {};
- var multipolygon;
var base = context.history().base();
- for (var i2 = 0; i2 < entities.length; i2++) {
- var entity = entities[i2];
- if (entity.geometry(graph) !== "area")
- continue;
- multipolygon = osmIsOldMultipolygonOuterMember(entity, graph);
- if (multipolygon) {
- areas[multipolygon.id] = {
- entity: multipolygon.mergeTags(entity.tags),
- area: Math.abs(entity.area(graph))
- };
- } else if (!areas[entity.id]) {
+ for (var i3 = 0; i3 < entities.length; i3++) {
+ var entity = entities[i3];
+ if (entity.geometry(graph) !== "area") continue;
+ if (!areas[entity.id]) {
areas[entity.id] = {
entity,
area: Math.abs(entity.area(graph))
};
}
}
- var fills = Object.values(areas).filter(function hasPath(a) {
- return path(a.entity);
+ var fills = Object.values(areas).filter(function hasPath(a2) {
+ return path(a2.entity);
});
- fills.sort(function areaSort(a, b) {
- return b.area - a.area;
+ fills.sort(function areaSort(a2, b2) {
+ return b2.area - a2.area;
});
- fills = fills.map(function(a) {
- return a.entity;
+ fills = fills.map(function(a2) {
+ return a2.entity;
});
var strokes = fills.filter(function(area) {
return area.type === "way";
@@ -45125,8 +48925,8 @@ ${content}
var drawLayer = selection2.selectAll(".layer-osm.areas");
var touchLayer = selection2.selectAll(".layer-touch.areas");
var areagroup = drawLayer.selectAll("g.areagroup").data(["fill", "shadow", "stroke"]);
- areagroup = areagroup.enter().append("g").attr("class", function(d) {
- return "areagroup area-" + d;
+ areagroup = areagroup.enter().append("g").attr("class", function(d2) {
+ return "areagroup area-" + d2;
}).merge(areagroup);
var paths = areagroup.selectAll("path").filter(filter2).data(function(layer) {
return data[layer];
@@ -45148,12 +48948,12 @@ ${content}
this.setAttribute("clip-path", "url(#ideditor-" + entity2.id + "-clippath)");
this.style.fill = this.style.stroke = getPatternStyle(entity2.tags);
}
- }).classed("added", function(d) {
- return !base.entities[d.id];
- }).classed("geometry-edited", function(d) {
- return graph.entities[d.id] && base.entities[d.id] && !(0, import_fast_deep_equal5.default)(graph.entities[d.id].nodes, base.entities[d.id].nodes);
- }).classed("retagged", function(d) {
- return graph.entities[d.id] && base.entities[d.id] && !(0, import_fast_deep_equal5.default)(graph.entities[d.id].tags, base.entities[d.id].tags);
+ }).classed("added", function(d2) {
+ return !base.entities[d2.id];
+ }).classed("geometry-edited", function(d2) {
+ return graph.entities[d2.id] && base.entities[d2.id] && !(0, import_fast_deep_equal5.default)(graph.entities[d2.id].nodes, base.entities[d2.id].nodes);
+ }).classed("retagged", function(d2) {
+ return graph.entities[d2.id] && base.entities[d2.id] && !(0, import_fast_deep_equal5.default)(graph.entities[d2.id].tags, base.entities[d2.id].tags);
}).call(svgTagClasses()).attr("d", path);
touchLayer.call(drawTargets, graph, data.stroke, filter2);
}
@@ -45163,64 +48963,129 @@ ${content}
// modules/svg/data.js
var import_fast_json_stable_stringify = __toESM(require_fast_json_stable_stringify());
- // node_modules/@tmcw/togeojson/dist/togeojson.es.js
- function nodeVal(x) {
- if (x && x.normalize) {
- x.normalize();
- }
- return x && x.textContent || "";
+ // node_modules/@tmcw/togeojson/dist/togeojson.es.mjs
+ function $(element, tagName) {
+ return Array.from(element.getElementsByTagName(tagName));
}
- function get1(x, y) {
- const n2 = x.getElementsByTagName(y);
- return n2.length ? n2[0] : null;
+ function normalizeId(id2) {
+ return id2[0] === "#" ? id2 : "#".concat(id2);
}
- function getLineStyle(extensions) {
- const style = {};
- if (extensions) {
- const lineStyle = get1(extensions, "line");
- if (lineStyle) {
- const color2 = nodeVal(get1(lineStyle, "color")), opacity = parseFloat(nodeVal(get1(lineStyle, "opacity"))), width = parseFloat(nodeVal(get1(lineStyle, "width")));
- if (color2)
- style.stroke = color2;
- if (!isNaN(opacity))
- style["stroke-opacity"] = opacity;
- if (!isNaN(width))
- style["stroke-width"] = width * 96 / 25.4;
- }
+ function $ns(element, tagName, ns) {
+ return Array.from(element.getElementsByTagNameNS(ns, tagName));
+ }
+ function nodeVal(node) {
+ node == null ? void 0 : node.normalize();
+ return (node == null ? void 0 : node.textContent) || "";
+ }
+ function get1(node, tagName, callback) {
+ const n3 = node.getElementsByTagName(tagName);
+ const result = n3.length ? n3[0] : null;
+ if (result && callback)
+ callback(result);
+ return result;
+ }
+ function get3(node, tagName, callback) {
+ const properties = {};
+ if (!node)
+ return properties;
+ const n3 = node.getElementsByTagName(tagName);
+ const result = n3.length ? n3[0] : null;
+ if (result && callback) {
+ return callback(result, properties);
+ }
+ return properties;
+ }
+ function val1(node, tagName, callback) {
+ const val = nodeVal(get1(node, tagName));
+ if (val && callback)
+ return callback(val) || {};
+ return {};
+ }
+ function $num(node, tagName, callback) {
+ const val = Number.parseFloat(nodeVal(get1(node, tagName)));
+ if (Number.isNaN(val))
+ return void 0;
+ if (val && callback)
+ return callback(val) || {};
+ return {};
+ }
+ function num1(node, tagName, callback) {
+ const val = Number.parseFloat(nodeVal(get1(node, tagName)));
+ if (Number.isNaN(val))
+ return void 0;
+ if (callback)
+ callback(val);
+ return val;
+ }
+ function getMulti(node, propertyNames) {
+ const properties = {};
+ for (const property of propertyNames) {
+ val1(node, property, (val) => {
+ properties[property] = val;
+ });
}
- return style;
+ return properties;
+ }
+ function isElement(node) {
+ return (node == null ? void 0 : node.nodeType) === 1;
}
function getExtensions(node) {
let values = [];
- if (node !== null) {
- for (let i2 = 0; i2 < node.childNodes.length; i2++) {
- const child = node.childNodes[i2];
- if (child.nodeType !== 1)
- continue;
- const name2 = ["heart", "gpxtpx:hr", "hr"].includes(child.nodeName) ? "heart" : child.nodeName;
- if (name2 === "gpxtpx:TrackPointExtension") {
- values = values.concat(getExtensions(child));
- } else {
- const val = nodeVal(child);
- values.push([name2, isNaN(val) ? val : parseFloat(val)]);
- }
+ if (node === null)
+ return values;
+ for (const child of Array.from(node.childNodes)) {
+ if (!isElement(child))
+ continue;
+ const name = abbreviateName(child.nodeName);
+ if (name === "gpxtpx:TrackPointExtension") {
+ values = values.concat(getExtensions(child));
+ } else {
+ const val = nodeVal(child);
+ values.push([name, parseNumeric(val)]);
}
}
return values;
}
- function getMulti(x, ys) {
- const o = {};
- let n2;
- let k;
- for (k = 0; k < ys.length; k++) {
- n2 = get1(x, ys[k]);
- if (n2)
- o[ys[k]] = nodeVal(n2);
+ function abbreviateName(name) {
+ return ["heart", "gpxtpx:hr", "hr"].includes(name) ? "heart" : name;
+ }
+ function parseNumeric(val) {
+ const num = Number.parseFloat(val);
+ return Number.isNaN(num) ? val : num;
+ }
+ function coordPair$1(node) {
+ const ll = [
+ Number.parseFloat(node.getAttribute("lon") || ""),
+ Number.parseFloat(node.getAttribute("lat") || "")
+ ];
+ if (Number.isNaN(ll[0]) || Number.isNaN(ll[1])) {
+ return null;
}
- return o;
+ num1(node, "ele", (val) => {
+ ll.push(val);
+ });
+ const time = get1(node, "time");
+ return {
+ coordinates: ll,
+ time: time ? nodeVal(time) : null,
+ extendedValues: getExtensions(get1(node, "extensions"))
+ };
+ }
+ function getLineStyle(node) {
+ return get3(node, "line", (lineStyle) => {
+ const val = Object.assign({}, val1(lineStyle, "color", (color2) => {
+ return { stroke: "#".concat(color2) };
+ }), $num(lineStyle, "opacity", (opacity) => {
+ return { "stroke-opacity": opacity };
+ }), $num(lineStyle, "width", (width) => {
+ return { "stroke-width": width * 96 / 25.4 };
+ }));
+ return val;
+ });
}
- function getProperties$1(node) {
- const prop = getMulti(node, [
+ function extractProperties(ns, node) {
+ var _a4;
+ const properties = getMulti(node, [
"name",
"cmt",
"desc",
@@ -45228,115 +49093,97 @@ ${content}
"time",
"keywords"
]);
- const extensions = node.getElementsByTagNameNS("http://www.garmin.com/xmlschemas/GpxExtensions/v3", "*");
- for (let i2 = 0; i2 < extensions.length; i2++) {
- const extension = extensions[i2];
- if (extension.parentNode.parentNode === node) {
- prop[extension.tagName.replace(":", "_")] = nodeVal(extension);
+ for (const [n3, url] of ns) {
+ for (const child of Array.from(node.getElementsByTagNameNS(url, "*"))) {
+ properties[child.tagName.replace(":", "_")] = (_a4 = nodeVal(child)) == null ? void 0 : _a4.trim();
}
}
- const links = node.getElementsByTagName("link");
- if (links.length)
- prop.links = [];
- for (let i2 = 0; i2 < links.length; i2++) {
- prop.links.push(Object.assign({ href: links[i2].getAttribute("href") }, getMulti(links[i2], ["text", "type"])));
+ const links = $(node, "link");
+ if (links.length) {
+ properties.links = links.map((link3) => Object.assign({ href: link3.getAttribute("href") }, getMulti(link3, ["text", "type"])));
}
- return prop;
+ return properties;
}
- function coordPair$1(x) {
- const ll = [
- parseFloat(x.getAttribute("lon")),
- parseFloat(x.getAttribute("lat"))
- ];
- const ele = get1(x, "ele");
- const time = get1(x, "time");
- if (ele) {
- const e = parseFloat(nodeVal(ele));
- if (!isNaN(e)) {
- ll.push(e);
+ function getPoints$1(node, pointname) {
+ const pts = $(node, pointname);
+ const line = [];
+ const times = [];
+ const extendedValues = {};
+ for (let i3 = 0; i3 < pts.length; i3++) {
+ const c2 = coordPair$1(pts[i3]);
+ if (!c2) {
+ continue;
+ }
+ line.push(c2.coordinates);
+ if (c2.time)
+ times.push(c2.time);
+ for (const [name, val] of c2.extendedValues) {
+ const plural = name === "heart" ? name : "".concat(name.replace("gpxtpx:", ""), "s");
+ if (!extendedValues[plural]) {
+ extendedValues[plural] = Array(pts.length).fill(null);
+ }
+ extendedValues[plural][i3] = val;
}
}
+ if (line.length < 2)
+ return;
return {
- coordinates: ll,
- time: time ? nodeVal(time) : null,
- extendedValues: getExtensions(get1(x, "extensions"))
+ line,
+ times,
+ extendedValues
};
}
- function getRoute(node) {
+ function getRoute(ns, node) {
const line = getPoints$1(node, "rtept");
if (!line)
return;
return {
type: "Feature",
- properties: Object.assign(getProperties$1(node), getLineStyle(get1(node, "extensions")), { _gpxType: "rte" }),
+ properties: Object.assign({ _gpxType: "rte" }, extractProperties(ns, node), getLineStyle(get1(node, "extensions"))),
geometry: {
type: "LineString",
coordinates: line.line
}
};
}
- function getPoints$1(node, pointname) {
- const pts = node.getElementsByTagName(pointname);
- if (pts.length < 2)
- return;
- const line = [];
- const times = [];
- const extendedValues = {};
- for (let i2 = 0; i2 < pts.length; i2++) {
- const c = coordPair$1(pts[i2]);
- line.push(c.coordinates);
- if (c.time)
- times.push(c.time);
- for (let j2 = 0; j2 < c.extendedValues.length; j2++) {
- const [name2, val] = c.extendedValues[j2];
- const plural = name2 === "heart" ? name2 : name2.replace("gpxtpx:", "") + "s";
- if (!extendedValues[plural]) {
- extendedValues[plural] = Array(pts.length).fill(null);
- }
- extendedValues[plural][i2] = val;
- }
- }
- return {
- line,
- times,
- extendedValues
- };
- }
- function getTrack(node) {
- const segments = node.getElementsByTagName("trkseg");
+ function getTrack(ns, node) {
+ var _a4;
+ const segments = $(node, "trkseg");
const track = [];
const times = [];
const extractedLines = [];
- for (let i2 = 0; i2 < segments.length; i2++) {
- const line = getPoints$1(segments[i2], "trkpt");
+ for (const segment of segments) {
+ const line = getPoints$1(segment, "trkpt");
if (line) {
extractedLines.push(line);
- if (line.times && line.times.length)
+ if ((_a4 = line.times) == null ? void 0 : _a4.length)
times.push(line.times);
}
}
if (extractedLines.length === 0)
- return;
+ return null;
const multi = extractedLines.length > 1;
- const properties = Object.assign(getProperties$1(node), getLineStyle(get1(node, "extensions")), { _gpxType: "trk" }, times.length ? {
+ const properties = Object.assign({ _gpxType: "trk" }, extractProperties(ns, node), getLineStyle(get1(node, "extensions")), times.length ? {
coordinateProperties: {
times: multi ? times : times[0]
}
} : {});
- for (let i2 = 0; i2 < extractedLines.length; i2++) {
- const line = extractedLines[i2];
+ for (const line of extractedLines) {
track.push(line.line);
- for (const [name2, val] of Object.entries(line.extendedValues)) {
- if (!properties.coordinateProperties) {
- properties.coordinateProperties = {};
- }
- const props = properties.coordinateProperties;
+ if (!properties.coordinateProperties) {
+ properties.coordinateProperties = {};
+ }
+ const props = properties.coordinateProperties;
+ const entries = Object.entries(line.extendedValues);
+ for (let i3 = 0; i3 < entries.length; i3++) {
+ const [name, val] = entries[i3];
if (multi) {
- if (!props[name2])
- props[name2] = extractedLines.map((line2) => new Array(line2.line.length).fill(null));
- props[name2][i2] = val;
+ if (!props[name]) {
+ props[name] = extractedLines.map((line2) => new Array(line2.line.length).fill(null));
+ }
+ props[name][i3] = val;
} else {
- props[name2] = val;
+ props[name] = val;
}
}
}
@@ -45352,327 +49199,514 @@ ${content}
}
};
}
- function getPoint(node) {
+ function getPoint(ns, node) {
+ const properties = Object.assign(extractProperties(ns, node), getMulti(node, ["sym"]));
+ const pair3 = coordPair$1(node);
+ if (!pair3)
+ return null;
return {
type: "Feature",
- properties: Object.assign(getProperties$1(node), getMulti(node, ["sym"])),
+ properties,
geometry: {
type: "Point",
- coordinates: coordPair$1(node).coordinates
+ coordinates: pair3.coordinates
}
};
}
- function* gpxGen(doc) {
- const tracks = doc.getElementsByTagName("trk");
- const routes = doc.getElementsByTagName("rte");
- const waypoints = doc.getElementsByTagName("wpt");
- for (let i2 = 0; i2 < tracks.length; i2++) {
- const feature3 = getTrack(tracks[i2]);
+ function* gpxGen(node) {
+ var _a4, _b3;
+ const GPXX = "gpxx";
+ const GPXX_URI = "http://www.garmin.com/xmlschemas/GpxExtensions/v3";
+ const ns = [[GPXX, GPXX_URI]];
+ const attrs = (_a4 = node.getElementsByTagName("gpx")[0]) == null ? void 0 : _a4.attributes;
+ if (attrs) {
+ for (const attr of Array.from(attrs)) {
+ if (((_b3 = attr.name) == null ? void 0 : _b3.startsWith("xmlns:")) && attr.value !== GPXX_URI) {
+ ns.push([attr.name, attr.value]);
+ }
+ }
+ }
+ for (const track of $(node, "trk")) {
+ const feature3 = getTrack(ns, track);
if (feature3)
yield feature3;
}
- for (let i2 = 0; i2 < routes.length; i2++) {
- const feature3 = getRoute(routes[i2]);
+ for (const route of $(node, "rte")) {
+ const feature3 = getRoute(ns, route);
if (feature3)
yield feature3;
}
- for (let i2 = 0; i2 < waypoints.length; i2++) {
- yield getPoint(waypoints[i2]);
+ for (const waypoint of $(node, "wpt")) {
+ const point = getPoint(ns, waypoint);
+ if (point)
+ yield point;
}
}
- function gpx(doc) {
+ function gpx(node) {
return {
type: "FeatureCollection",
- features: Array.from(gpxGen(doc))
+ features: Array.from(gpxGen(node))
};
}
+ function fixColor(v2, prefix) {
+ const properties = {};
+ const colorProp = prefix === "stroke" || prefix === "fill" ? prefix : "".concat(prefix, "-color");
+ if (v2[0] === "#") {
+ v2 = v2.substring(1);
+ }
+ if (v2.length === 6 || v2.length === 3) {
+ properties[colorProp] = "#".concat(v2);
+ } else if (v2.length === 8) {
+ properties["".concat(prefix, "-opacity")] = Number.parseInt(v2.substring(0, 2), 16) / 255;
+ properties[colorProp] = "#".concat(v2.substring(6, 8)).concat(v2.substring(4, 6)).concat(v2.substring(2, 4));
+ }
+ return properties;
+ }
+ function numericProperty(node, source, target) {
+ const properties = {};
+ num1(node, source, (val) => {
+ properties[target] = val;
+ });
+ return properties;
+ }
+ function getColor(node, output) {
+ return get3(node, "color", (elem) => fixColor(nodeVal(elem), output));
+ }
+ function extractIconHref(node) {
+ return get3(node, "Icon", (icon2, properties) => {
+ val1(icon2, "href", (href) => {
+ properties.icon = href;
+ });
+ return properties;
+ });
+ }
+ function extractIcon(node) {
+ return get3(node, "IconStyle", (iconStyle) => {
+ return Object.assign(getColor(iconStyle, "icon"), numericProperty(iconStyle, "scale", "icon-scale"), numericProperty(iconStyle, "heading", "icon-heading"), get3(iconStyle, "hotSpot", (hotspot) => {
+ const left = Number.parseFloat(hotspot.getAttribute("x") || "");
+ const top = Number.parseFloat(hotspot.getAttribute("y") || "");
+ const xunits = hotspot.getAttribute("xunits") || "";
+ const yunits = hotspot.getAttribute("yunits") || "";
+ if (!Number.isNaN(left) && !Number.isNaN(top))
+ return {
+ "icon-offset": [left, top],
+ "icon-offset-units": [xunits, yunits]
+ };
+ return {};
+ }), extractIconHref(iconStyle));
+ });
+ }
+ function extractLabel(node) {
+ return get3(node, "LabelStyle", (labelStyle) => {
+ return Object.assign(getColor(labelStyle, "label"), numericProperty(labelStyle, "scale", "label-scale"));
+ });
+ }
+ function extractLine(node) {
+ return get3(node, "LineStyle", (lineStyle) => {
+ return Object.assign(getColor(lineStyle, "stroke"), numericProperty(lineStyle, "width", "stroke-width"));
+ });
+ }
+ function extractPoly(node) {
+ return get3(node, "PolyStyle", (polyStyle, properties) => {
+ return Object.assign(properties, get3(polyStyle, "color", (elem) => fixColor(nodeVal(elem), "fill")), val1(polyStyle, "fill", (fill) => {
+ if (fill === "0")
+ return { "fill-opacity": 0 };
+ }), val1(polyStyle, "outline", (outline) => {
+ if (outline === "0")
+ return { "stroke-opacity": 0 };
+ }));
+ });
+ }
+ function extractStyle(node) {
+ return Object.assign({}, extractPoly(node), extractLine(node), extractLabel(node), extractIcon(node));
+ }
var removeSpace = /\s*/g;
var trimSpace = /^\s*|\s*$/g;
var splitSpace = /\s+/;
- function okhash(x) {
- if (!x || !x.length)
- return 0;
- let h = 0;
- for (let i2 = 0; i2 < x.length; i2++) {
- h = (h << 5) - h + x.charCodeAt(i2) | 0;
- }
- return h;
- }
- function coord1(v) {
- return v.replace(removeSpace, "").split(",").map(parseFloat);
+ function coord1(value) {
+ return value.replace(removeSpace, "").split(",").map(Number.parseFloat).filter((num) => !Number.isNaN(num)).slice(0, 3);
}
- function coord(v) {
- return v.replace(trimSpace, "").split(splitSpace).map(coord1);
+ function coord(value) {
+ return value.replace(trimSpace, "").split(splitSpace).map(coord1).filter((coord2) => {
+ return coord2.length >= 2;
+ });
}
- function xml2str(node) {
- if (node.xml !== void 0)
- return node.xml;
- if (node.tagName) {
- let output = node.tagName;
- for (let i2 = 0; i2 < node.attributes.length; i2++) {
- output += node.attributes[i2].name + node.attributes[i2].value;
- }
- for (let i2 = 0; i2 < node.childNodes.length; i2++) {
- output += xml2str(node.childNodes[i2]);
- }
- return output;
- }
- if (node.nodeName === "#text") {
- return (node.nodeValue || node.value || "").trim();
+ function gxCoords(node) {
+ let elems = $(node, "coord");
+ if (elems.length === 0) {
+ elems = $ns(node, "coord", "*");
}
- if (node.nodeName === "#cdata-section") {
- return node.nodeValue;
+ const coordinates = elems.map((elem) => {
+ return nodeVal(elem).split(" ").map(Number.parseFloat);
+ });
+ if (coordinates.length === 0) {
+ return null;
}
- return "";
- }
- var geotypes = ["Polygon", "LineString", "Point", "Track", "gx:Track"];
- function kmlColor(properties, elem, prefix) {
- let v = nodeVal(get1(elem, "color")) || "";
- const colorProp = prefix == "stroke" || prefix === "fill" ? prefix : prefix + "-color";
- if (v.substr(0, 1) === "#") {
- v = v.substr(1);
+ return {
+ geometry: coordinates.length > 2 ? {
+ type: "LineString",
+ coordinates
+ } : {
+ type: "Point",
+ coordinates: coordinates[0]
+ },
+ times: $(node, "when").map((elem) => nodeVal(elem))
+ };
+ }
+ function fixRing(ring) {
+ if (ring.length === 0)
+ return ring;
+ const first = ring[0];
+ const last = ring[ring.length - 1];
+ let equal = true;
+ for (let i3 = 0; i3 < Math.max(first.length, last.length); i3++) {
+ if (first[i3] !== last[i3]) {
+ equal = false;
+ break;
+ }
}
- if (v.length === 6 || v.length === 3) {
- properties[colorProp] = v;
- } else if (v.length === 8) {
- properties[prefix + "-opacity"] = parseInt(v.substr(0, 2), 16) / 255;
- properties[colorProp] = "#" + v.substr(6, 2) + v.substr(4, 2) + v.substr(2, 2);
+ if (!equal) {
+ return ring.concat([ring[0]]);
}
+ return ring;
}
- function numericProperty(properties, elem, source, target) {
- const val = parseFloat(nodeVal(get1(elem, source)));
- if (!isNaN(val))
- properties[target] = val;
+ function getCoordinates(node) {
+ return nodeVal(get1(node, "coordinates"));
}
- function gxCoords(root3) {
- let elems = root3.getElementsByTagName("coord");
- const coords = [];
- const times = [];
- if (elems.length === 0)
- elems = root3.getElementsByTagName("gx:coord");
- for (let i2 = 0; i2 < elems.length; i2++) {
- coords.push(nodeVal(elems[i2]).split(" ").map(parseFloat));
- }
- const timeElems = root3.getElementsByTagName("when");
- for (let j2 = 0; j2 < timeElems.length; j2++)
- times.push(nodeVal(timeElems[j2]));
- return {
- coords,
- times
- };
- }
- function getGeometry(root3) {
- let geomNode;
- let geomNodes;
- let i2;
- let j2;
- let k;
- const geoms = [];
- const coordTimes = [];
- if (get1(root3, "MultiGeometry")) {
- return getGeometry(get1(root3, "MultiGeometry"));
- }
- if (get1(root3, "MultiTrack")) {
- return getGeometry(get1(root3, "MultiTrack"));
- }
- if (get1(root3, "gx:MultiTrack")) {
- return getGeometry(get1(root3, "gx:MultiTrack"));
- }
- for (i2 = 0; i2 < geotypes.length; i2++) {
- geomNodes = root3.getElementsByTagName(geotypes[i2]);
- if (geomNodes) {
- for (j2 = 0; j2 < geomNodes.length; j2++) {
- geomNode = geomNodes[j2];
- if (geotypes[i2] === "Point") {
- geoms.push({
- type: "Point",
- coordinates: coord1(nodeVal(get1(geomNode, "coordinates")))
- });
- } else if (geotypes[i2] === "LineString") {
- geoms.push({
- type: "LineString",
- coordinates: coord(nodeVal(get1(geomNode, "coordinates")))
- });
- } else if (geotypes[i2] === "Polygon") {
- const rings = geomNode.getElementsByTagName("LinearRing"), coords = [];
- for (k = 0; k < rings.length; k++) {
- coords.push(coord(nodeVal(get1(rings[k], "coordinates"))));
+ function getGeometry(node) {
+ let geometries = [];
+ let coordTimes = [];
+ for (let i3 = 0; i3 < node.childNodes.length; i3++) {
+ const child = node.childNodes.item(i3);
+ if (isElement(child)) {
+ switch (child.tagName) {
+ case "MultiGeometry":
+ case "MultiTrack":
+ case "gx:MultiTrack": {
+ const childGeometries = getGeometry(child);
+ geometries = geometries.concat(childGeometries.geometries);
+ coordTimes = coordTimes.concat(childGeometries.coordTimes);
+ break;
+ }
+ case "Point": {
+ const coordinates = coord1(getCoordinates(child));
+ if (coordinates.length >= 2) {
+ geometries.push({
+ type: "Point",
+ coordinates
+ });
}
- geoms.push({
- type: "Polygon",
- coordinates: coords
- });
- } else if (geotypes[i2] === "Track" || geotypes[i2] === "gx:Track") {
- const track = gxCoords(geomNode);
- geoms.push({
- type: "LineString",
- coordinates: track.coords
- });
- if (track.times.length)
- coordTimes.push(track.times);
+ break;
+ }
+ case "LinearRing":
+ case "LineString": {
+ const coordinates = coord(getCoordinates(child));
+ if (coordinates.length >= 2) {
+ geometries.push({
+ type: "LineString",
+ coordinates
+ });
+ }
+ break;
+ }
+ case "Polygon": {
+ const coords = [];
+ for (const linearRing of $(child, "LinearRing")) {
+ const ring = fixRing(coord(getCoordinates(linearRing)));
+ if (ring.length >= 4) {
+ coords.push(ring);
+ }
+ }
+ if (coords.length) {
+ geometries.push({
+ type: "Polygon",
+ coordinates: coords
+ });
+ }
+ break;
+ }
+ case "Track":
+ case "gx:Track": {
+ const gx = gxCoords(child);
+ if (!gx)
+ break;
+ const { times, geometry } = gx;
+ geometries.push(geometry);
+ if (times.length)
+ coordTimes.push(times);
+ break;
}
}
}
}
return {
- geoms,
+ geometries,
coordTimes
};
}
- function getPlacemark(root3, styleIndex, styleMapIndex, styleByHash) {
- const geomsAndTimes = getGeometry(root3);
- let i2;
- const properties = {};
- const name2 = nodeVal(get1(root3, "name"));
- const address = nodeVal(get1(root3, "address"));
- let styleUrl = nodeVal(get1(root3, "styleUrl"));
- const description2 = nodeVal(get1(root3, "description"));
- const timeSpan = get1(root3, "TimeSpan");
- const timeStamp = get1(root3, "TimeStamp");
- const extendedData = get1(root3, "ExtendedData");
- let iconStyle = get1(root3, "IconStyle");
- let labelStyle = get1(root3, "LabelStyle");
- let lineStyle = get1(root3, "LineStyle");
- let polyStyle = get1(root3, "PolyStyle");
- const visibility = get1(root3, "visibility");
- if (name2)
- properties.name = name2;
- if (address)
- properties.address = address;
- if (styleUrl) {
- if (styleUrl[0] !== "#") {
- styleUrl = "#" + styleUrl;
- }
- properties.styleUrl = styleUrl;
- if (styleIndex[styleUrl]) {
- properties.styleHash = styleIndex[styleUrl];
- }
- if (styleMapIndex[styleUrl]) {
- properties.styleMapHash = styleMapIndex[styleUrl];
- properties.styleHash = styleIndex[styleMapIndex[styleUrl].normal];
- }
- const style = styleByHash[properties.styleHash];
- if (style) {
- if (!iconStyle)
- iconStyle = get1(style, "IconStyle");
- if (!labelStyle)
- labelStyle = get1(style, "LabelStyle");
- if (!lineStyle)
- lineStyle = get1(style, "LineStyle");
- if (!polyStyle)
- polyStyle = get1(style, "PolyStyle");
- }
- }
- if (description2)
- properties.description = description2;
- if (timeSpan) {
- const begin = nodeVal(get1(timeSpan, "begin"));
- const end = nodeVal(get1(timeSpan, "end"));
- properties.timespan = { begin, end };
- }
- if (timeStamp) {
- properties.timestamp = nodeVal(get1(timeStamp, "when"));
- }
- if (iconStyle) {
- kmlColor(properties, iconStyle, "icon");
- numericProperty(properties, iconStyle, "scale", "icon-scale");
- numericProperty(properties, iconStyle, "heading", "icon-heading");
- const hotspot = get1(iconStyle, "hotSpot");
- if (hotspot) {
- const left = parseFloat(hotspot.getAttribute("x"));
- const top = parseFloat(hotspot.getAttribute("y"));
- if (!isNaN(left) && !isNaN(top))
- properties["icon-offset"] = [left, top];
- }
- const icon2 = get1(iconStyle, "Icon");
- if (icon2) {
- const href = nodeVal(get1(icon2, "href"));
- if (href)
- properties.icon = href;
- }
- }
- if (labelStyle) {
- kmlColor(properties, labelStyle, "label");
- numericProperty(properties, labelStyle, "scale", "label-scale");
- }
- if (lineStyle) {
- kmlColor(properties, lineStyle, "stroke");
- numericProperty(properties, lineStyle, "width", "stroke-width");
- }
- if (polyStyle) {
- kmlColor(properties, polyStyle, "fill");
- const fill = nodeVal(get1(polyStyle, "fill"));
- const outline = nodeVal(get1(polyStyle, "outline"));
- if (fill)
- properties["fill-opacity"] = fill === "1" ? properties["fill-opacity"] || 1 : 0;
- if (outline)
- properties["stroke-opacity"] = outline === "1" ? properties["stroke-opacity"] || 1 : 0;
- }
- if (extendedData) {
- const datas = extendedData.getElementsByTagName("Data"), simpleDatas = extendedData.getElementsByTagName("SimpleData");
- for (i2 = 0; i2 < datas.length; i2++) {
- properties[datas[i2].getAttribute("name")] = nodeVal(get1(datas[i2], "value"));
- }
- for (i2 = 0; i2 < simpleDatas.length; i2++) {
- properties[simpleDatas[i2].getAttribute("name")] = nodeVal(simpleDatas[i2]);
- }
- }
- if (visibility) {
- properties.visibility = nodeVal(visibility);
- }
- if (geomsAndTimes.coordTimes.length) {
- properties.coordinateProperties = {
- times: geomsAndTimes.coordTimes.length === 1 ? geomsAndTimes.coordTimes[0] : geomsAndTimes.coordTimes
+ var toNumber2 = (x2) => Number(x2);
+ var typeConverters = {
+ string: (x2) => x2,
+ int: toNumber2,
+ uint: toNumber2,
+ short: toNumber2,
+ ushort: toNumber2,
+ float: toNumber2,
+ double: toNumber2,
+ bool: (x2) => Boolean(x2)
+ };
+ function extractExtendedData(node, schema) {
+ return get3(node, "ExtendedData", (extendedData, properties) => {
+ for (const data of $(extendedData, "Data")) {
+ properties[data.getAttribute("name") || ""] = nodeVal(get1(data, "value"));
+ }
+ for (const simpleData of $(extendedData, "SimpleData")) {
+ const name = simpleData.getAttribute("name") || "";
+ const typeConverter = schema[name] || typeConverters.string;
+ properties[name] = typeConverter(nodeVal(simpleData));
+ }
+ return properties;
+ });
+ }
+ function getMaybeHTMLDescription(node) {
+ const descriptionNode = get1(node, "description");
+ for (const c2 of Array.from((descriptionNode == null ? void 0 : descriptionNode.childNodes) || [])) {
+ if (c2.nodeType === 4) {
+ return {
+ description: {
+ "@type": "html",
+ value: nodeVal(c2)
+ }
+ };
+ }
+ }
+ return {};
+ }
+ function extractTimeSpan(node) {
+ return get3(node, "TimeSpan", (timeSpan) => {
+ return {
+ timespan: {
+ begin: nodeVal(get1(timeSpan, "begin")),
+ end: nodeVal(get1(timeSpan, "end"))
+ }
+ };
+ });
+ }
+ function extractTimeStamp(node) {
+ return get3(node, "TimeStamp", (timeStamp) => {
+ return { timestamp: nodeVal(get1(timeStamp, "when")) };
+ });
+ }
+ function extractCascadedStyle(node, styleMap) {
+ return val1(node, "styleUrl", (styleUrl) => {
+ styleUrl = normalizeId(styleUrl);
+ if (styleMap[styleUrl]) {
+ return Object.assign({ styleUrl }, styleMap[styleUrl]);
+ }
+ return { styleUrl };
+ });
+ }
+ function getGroundOverlayBox(node) {
+ const latLonQuad = get1(node, "gx:LatLonQuad");
+ if (latLonQuad) {
+ const ring = fixRing(coord(getCoordinates(node)));
+ return {
+ geometry: {
+ type: "Polygon",
+ coordinates: [ring]
+ }
};
}
+ return getLatLonBox(node);
+ }
+ var DEGREES_TO_RADIANS = Math.PI / 180;
+ function rotateBox(bbox2, coordinates, rotation) {
+ const center = [(bbox2[0] + bbox2[2]) / 2, (bbox2[1] + bbox2[3]) / 2];
+ return [
+ coordinates[0].map((coordinate) => {
+ const dy = coordinate[1] - center[1];
+ const dx = coordinate[0] - center[0];
+ const distance = Math.sqrt(dy ** 2 + dx ** 2);
+ const angle2 = Math.atan2(dy, dx) + rotation * DEGREES_TO_RADIANS;
+ return [
+ center[0] + Math.cos(angle2) * distance,
+ center[1] + Math.sin(angle2) * distance
+ ];
+ })
+ ];
+ }
+ function getLatLonBox(node) {
+ const latLonBox = get1(node, "LatLonBox");
+ if (latLonBox) {
+ const north = num1(latLonBox, "north");
+ const west = num1(latLonBox, "west");
+ const east = num1(latLonBox, "east");
+ const south = num1(latLonBox, "south");
+ const rotation = num1(latLonBox, "rotation");
+ if (typeof north === "number" && typeof south === "number" && typeof west === "number" && typeof east === "number") {
+ const bbox2 = [west, south, east, north];
+ let coordinates = [
+ [
+ [west, north],
+ // top left
+ [east, north],
+ // top right
+ [east, south],
+ // top right
+ [west, south],
+ // bottom left
+ [west, north]
+ // top left (again)
+ ]
+ ];
+ if (typeof rotation === "number") {
+ coordinates = rotateBox(bbox2, coordinates, rotation);
+ }
+ return {
+ bbox: bbox2,
+ geometry: {
+ type: "Polygon",
+ coordinates
+ }
+ };
+ }
+ }
+ return null;
+ }
+ function getGroundOverlay(node, styleMap, schema, options2) {
+ var _a4;
+ const box = getGroundOverlayBox(node);
+ const geometry = (box == null ? void 0 : box.geometry) || null;
+ if (!geometry && options2.skipNullGeometry) {
+ return null;
+ }
const feature3 = {
type: "Feature",
- geometry: geomsAndTimes.geoms.length === 0 ? null : geomsAndTimes.geoms.length === 1 ? geomsAndTimes.geoms[0] : {
- type: "GeometryCollection",
- geometries: geomsAndTimes.geoms
- },
- properties
+ geometry,
+ properties: Object.assign(
+ /**
+ * Related to
+ * https://gist.github.com/tmcw/037a1cb6660d74a392e9da7446540f46
+ */
+ { "@geometry-type": "groundoverlay" },
+ getMulti(node, [
+ "name",
+ "address",
+ "visibility",
+ "open",
+ "phoneNumber",
+ "description"
+ ]),
+ getMaybeHTMLDescription(node),
+ extractCascadedStyle(node, styleMap),
+ extractStyle(node),
+ extractIconHref(node),
+ extractExtendedData(node, schema),
+ extractTimeSpan(node),
+ extractTimeStamp(node)
+ )
+ };
+ if (box == null ? void 0 : box.bbox) {
+ feature3.bbox = box.bbox;
+ }
+ if (((_a4 = feature3.properties) == null ? void 0 : _a4.visibility) !== void 0) {
+ feature3.properties.visibility = feature3.properties.visibility !== "0";
+ }
+ const id2 = node.getAttribute("id");
+ if (id2 !== null && id2 !== "")
+ feature3.id = id2;
+ return feature3;
+ }
+ function geometryListToGeometry(geometries) {
+ return geometries.length === 0 ? null : geometries.length === 1 ? geometries[0] : {
+ type: "GeometryCollection",
+ geometries
};
- if (root3.getAttribute("id"))
- feature3.id = root3.getAttribute("id");
+ }
+ function getPlacemark(node, styleMap, schema, options2) {
+ var _a4;
+ const { coordTimes, geometries } = getGeometry(node);
+ const geometry = geometryListToGeometry(geometries);
+ if (!geometry && options2.skipNullGeometry) {
+ return null;
+ }
+ const feature3 = {
+ type: "Feature",
+ geometry,
+ properties: Object.assign(getMulti(node, [
+ "name",
+ "address",
+ "visibility",
+ "open",
+ "phoneNumber",
+ "description"
+ ]), getMaybeHTMLDescription(node), extractCascadedStyle(node, styleMap), extractStyle(node), extractExtendedData(node, schema), extractTimeSpan(node), extractTimeStamp(node), coordTimes.length ? {
+ coordinateProperties: {
+ times: coordTimes.length === 1 ? coordTimes[0] : coordTimes
+ }
+ } : {})
+ };
+ if (((_a4 = feature3.properties) == null ? void 0 : _a4.visibility) !== void 0) {
+ feature3.properties.visibility = feature3.properties.visibility !== "0";
+ }
+ const id2 = node.getAttribute("id");
+ if (id2 !== null && id2 !== "")
+ feature3.id = id2;
return feature3;
}
- function* kmlGen(doc) {
- const styleIndex = {};
- const styleByHash = {};
- const styleMapIndex = {};
- const placemarks = doc.getElementsByTagName("Placemark");
- const styles = doc.getElementsByTagName("Style");
- const styleMaps = doc.getElementsByTagName("StyleMap");
- for (let k = 0; k < styles.length; k++) {
- const style = styles[k];
- const hash = okhash(xml2str(style)).toString(16);
- let id2 = style.getAttribute("id");
- if (!id2 && style.parentNode.tagName.replace("gx:", "") === "CascadingStyle") {
- id2 = style.parentNode.getAttribute("kml:id") || style.parentNode.getAttribute("id");
- }
- styleIndex["#" + id2] = hash;
- styleByHash[hash] = style;
- }
- for (let l = 0; l < styleMaps.length; l++) {
- styleIndex["#" + styleMaps[l].getAttribute("id")] = okhash(xml2str(styleMaps[l])).toString(16);
- const pairs = styleMaps[l].getElementsByTagName("Pair");
- const pairsMap = {};
- for (let m = 0; m < pairs.length; m++) {
- pairsMap[nodeVal(get1(pairs[m], "key"))] = nodeVal(get1(pairs[m], "styleUrl"));
- }
- styleMapIndex["#" + styleMaps[l].getAttribute("id")] = pairsMap;
- }
- for (let j2 = 0; j2 < placemarks.length; j2++) {
- const feature3 = getPlacemark(placemarks[j2], styleIndex, styleMapIndex, styleByHash);
+ function getStyleId(style) {
+ let id2 = style.getAttribute("id");
+ const parentNode = style.parentNode;
+ if (!id2 && isElement(parentNode) && parentNode.localName === "CascadingStyle") {
+ id2 = parentNode.getAttribute("kml:id") || parentNode.getAttribute("id");
+ }
+ return normalizeId(id2 || "");
+ }
+ function buildStyleMap(node) {
+ const styleMap = {};
+ for (const style of $(node, "Style")) {
+ styleMap[getStyleId(style)] = extractStyle(style);
+ }
+ for (const map2 of $(node, "StyleMap")) {
+ const id2 = normalizeId(map2.getAttribute("id") || "");
+ val1(map2, "styleUrl", (styleUrl) => {
+ styleUrl = normalizeId(styleUrl);
+ if (styleMap[styleUrl]) {
+ styleMap[id2] = styleMap[styleUrl];
+ }
+ });
+ }
+ return styleMap;
+ }
+ function buildSchema(node) {
+ const schema = {};
+ for (const field of $(node, "SimpleField")) {
+ schema[field.getAttribute("name") || ""] = typeConverters[field.getAttribute("type") || ""] || typeConverters.string;
+ }
+ return schema;
+ }
+ function* kmlGen(node, options2 = {
+ skipNullGeometry: false
+ }) {
+ const styleMap = buildStyleMap(node);
+ const schema = buildSchema(node);
+ for (const placemark of $(node, "Placemark")) {
+ const feature3 = getPlacemark(placemark, styleMap, schema, options2);
+ if (feature3)
+ yield feature3;
+ }
+ for (const groundOverlay of $(node, "GroundOverlay")) {
+ const feature3 = getGroundOverlay(groundOverlay, styleMap, schema, options2);
if (feature3)
yield feature3;
}
}
- function kml(doc) {
+ function kml(node, options2 = {
+ skipNullGeometry: false
+ }) {
return {
type: "FeatureCollection",
- features: Array.from(kmlGen(doc))
+ features: Array.from(kmlGen(node, options2))
};
}
@@ -45680,9 +49714,9 @@ ${content}
var _initialized = false;
var _enabled = false;
var _geojson;
- function svgData(projection2, context, dispatch10) {
+ function svgData(projection2, context, dispatch14) {
var throttledRedraw = throttle_default(function() {
- dispatch10.call("change");
+ dispatch14.call("change");
}, 1e3);
var _showLabels = true;
var detected = utilDetect();
@@ -45691,9 +49725,14 @@ ${content}
var _fileList;
var _template;
var _src;
+ const supportedFormats = [
+ ".gpx",
+ ".kml",
+ ".geojson",
+ ".json"
+ ];
function init2() {
- if (_initialized)
- return;
+ if (_initialized) return;
_geojson = {};
_enabled = true;
function over(d3_event) {
@@ -45704,8 +49743,10 @@ ${content}
context.container().attr("dropzone", "copy").on("drop.svgData", function(d3_event) {
d3_event.stopPropagation();
d3_event.preventDefault();
- if (!detected.filedrop)
- return;
+ if (!detected.filedrop) return;
+ var f2 = d3_event.dataTransfer.files[0];
+ var extension = getExtension(f2.name);
+ if (!supportedFormats.includes(extension)) return;
drawData.fileList(d3_event.dataTransfer.files);
}).on("dragenter.svgData", over).on("dragexit.svgData", over).on("dragover.svgData", over);
_initialized = true;
@@ -45722,7 +49763,7 @@ ${content}
function showLayer() {
layerOn();
layer.style("opacity", 0).transition().duration(250).style("opacity", 1).on("end", function() {
- dispatch10.call("change");
+ dispatch14.call("change");
});
}
function hideLayer() {
@@ -45737,11 +49778,10 @@ ${content}
layer.style("display", "none");
}
function ensureIDs(gj) {
- if (!gj)
- return null;
+ if (!gj) return null;
if (gj.type === "FeatureCollection") {
- for (var i2 = 0; i2 < gj.features.length; i2++) {
- ensureFeatureID(gj.features[i2]);
+ for (var i3 = 0; i3 < gj.features.length; i3++) {
+ ensureFeatureID(gj.features[i3]);
}
} else {
ensureFeatureID(gj);
@@ -45749,35 +49789,33 @@ ${content}
return gj;
}
function ensureFeatureID(feature3) {
- if (!feature3)
- return;
+ if (!feature3) return;
feature3.__featurehash__ = utilHashcode((0, import_fast_json_stable_stringify.default)(feature3));
return feature3;
}
function getFeatures(gj) {
- if (!gj)
- return [];
+ if (!gj) return [];
if (gj.type === "FeatureCollection") {
return gj.features;
} else {
return [gj];
}
}
- function featureKey(d) {
- return d.__featurehash__;
+ function featureKey(d2) {
+ return d2.__featurehash__;
}
- function isPolygon(d) {
- return d.geometry.type === "Polygon" || d.geometry.type === "MultiPolygon";
+ function isPolygon(d2) {
+ return d2.geometry.type === "Polygon" || d2.geometry.type === "MultiPolygon";
}
- function clipPathID(d) {
- return "ideditor-data-" + d.__featurehash__ + "-clippath";
+ function clipPathID(d2) {
+ return "ideditor-data-" + d2.__featurehash__ + "-clippath";
}
- function featureClasses(d) {
+ function featureClasses(d2) {
return [
- "data" + d.__featurehash__,
- d.geometry.type,
- isPolygon(d) ? "area" : "",
- d.__layerID__ || ""
+ "data" + d2.__featurehash__,
+ d2.geometry.type,
+ isPolygon(d2) ? "area" : "",
+ d2.__layerID__ || ""
].filter(Boolean).join(" ");
}
function drawData(selection2) {
@@ -45789,8 +49827,7 @@ ${content}
layer.exit().remove();
layer = layer.enter().append("g").attr("class", "layer-mapdata").merge(layer);
var surface = context.surface();
- if (!surface || surface.empty())
- return;
+ if (!surface || surface.empty()) return;
var geoData, polygonData;
if (_template && vtService) {
var sourceID = _template;
@@ -45807,8 +49844,8 @@ ${content}
clipPathsEnter.append("path");
clipPaths.merge(clipPathsEnter).selectAll("path").attr("d", getAreaPath);
var datagroups = layer.selectAll("g.datagroup").data(["fill", "shadow", "stroke"]);
- datagroups = datagroups.enter().append("g").attr("class", function(d) {
- return "datagroup datagroup-" + d;
+ datagroups = datagroups.enter().append("g").attr("class", function(d2) {
+ return "datagroup datagroup-" + d2;
}).merge(datagroups);
var pathData = {
fill: polygonData,
@@ -45819,42 +49856,41 @@ ${content}
return pathData[layer2];
}, featureKey);
paths.exit().remove();
- paths = paths.enter().append("path").attr("class", function(d) {
+ paths = paths.enter().append("path").attr("class", function(d2) {
var datagroup = this.parentNode.__data__;
- return "pathdata " + datagroup + " " + featureClasses(d);
- }).attr("clip-path", function(d) {
+ return "pathdata " + datagroup + " " + featureClasses(d2);
+ }).attr("clip-path", function(d2) {
var datagroup = this.parentNode.__data__;
- return datagroup === "fill" ? "url(#" + clipPathID(d) + ")" : null;
- }).merge(paths).attr("d", function(d) {
+ return datagroup === "fill" ? "url(#" + clipPathID(d2) + ")" : null;
+ }).merge(paths).attr("d", function(d2) {
var datagroup = this.parentNode.__data__;
- return datagroup === "fill" ? getAreaPath(d) : getPath(d);
+ return datagroup === "fill" ? getAreaPath(d2) : getPath(d2);
});
layer.call(drawLabels, "label-halo", geoData).call(drawLabels, "label", geoData);
function drawLabels(selection3, textClass, data) {
var labelPath = path_default(projection2);
- var labelData = data.filter(function(d) {
- return _showLabels && d.properties && (d.properties.desc || d.properties.name);
+ var labelData = data.filter(function(d2) {
+ return _showLabels && d2.properties && (d2.properties.desc || d2.properties.name);
});
var labels = selection3.selectAll("text." + textClass).data(labelData, featureKey);
labels.exit().remove();
- labels = labels.enter().append("text").attr("class", function(d) {
- return textClass + " " + featureClasses(d);
- }).merge(labels).text(function(d) {
- return d.properties.desc || d.properties.name;
- }).attr("x", function(d) {
- var centroid = labelPath.centroid(d);
+ labels = labels.enter().append("text").attr("class", function(d2) {
+ return textClass + " " + featureClasses(d2);
+ }).merge(labels).text(function(d2) {
+ return d2.properties.desc || d2.properties.name;
+ }).attr("x", function(d2) {
+ var centroid = labelPath.centroid(d2);
return centroid[0] + 11;
- }).attr("y", function(d) {
- var centroid = labelPath.centroid(d);
+ }).attr("y", function(d2) {
+ var centroid = labelPath.centroid(d2);
return centroid[1];
});
}
}
function getExtension(fileName) {
- if (!fileName)
- return;
- var re2 = /\.(gpx|kml|(geo)?json)$/i;
- var match = fileName.toLowerCase().match(re2);
+ if (!fileName) return;
+ var re3 = /\.(gpx|kml|(geo)?json|png)$/i;
+ var match = fileName.toLowerCase().match(re3);
return match && match.length && match[0];
}
function xmlToDom(textdata) {
@@ -45902,25 +49938,23 @@ ${content}
_src = extension + " data file";
this.fitZoom();
}
- dispatch10.call("change");
+ dispatch14.call("change");
return this;
};
drawData.showLabels = function(val) {
- if (!arguments.length)
- return _showLabels;
+ if (!arguments.length) return _showLabels;
_showLabels = val;
return this;
};
drawData.enabled = function(val) {
- if (!arguments.length)
- return _enabled;
+ if (!arguments.length) return _enabled;
_enabled = val;
if (_enabled) {
showLayer();
} else {
hideLayer();
}
- dispatch10.call("change");
+ dispatch14.call("change");
return this;
};
drawData.hasData = function() {
@@ -45928,20 +49962,18 @@ ${content}
return !!(_template || Object.keys(gj).length);
};
drawData.template = function(val, src) {
- if (!arguments.length)
- return _template;
+ if (!arguments.length) return _template;
var osm = context.connection();
if (osm) {
var blocklists = osm.imageryBlocklists();
var fail = false;
var tested = 0;
var regex;
- for (var i2 = 0; i2 < blocklists.length; i2++) {
- regex = blocklists[i2];
+ for (var i3 = 0; i3 < blocklists.length; i3++) {
+ regex = blocklists[i3];
fail = regex.test(val);
tested++;
- if (fail)
- break;
+ if (fail) break;
}
if (!tested) {
regex = /.*\.google(apis)?\..*\/(vt|kh)[\?\/].*([xyz]=.*){3}.*/;
@@ -45952,12 +49984,11 @@ ${content}
_fileList = null;
_geojson = null;
_src = src || "vectortile:" + val.split(/[?#]/)[0];
- dispatch10.call("change");
+ dispatch14.call("change");
return this;
};
drawData.geojson = function(gj, src) {
- if (!arguments.length)
- return _geojson;
+ if (!arguments.length) return _geojson;
_template = null;
_fileList = null;
_geojson = null;
@@ -45967,24 +49998,22 @@ ${content}
_geojson = ensureIDs(gj);
_src = src || "unknown.geojson";
}
- dispatch10.call("change");
+ dispatch14.call("change");
return this;
};
drawData.fileList = function(fileList) {
- if (!arguments.length)
- return _fileList;
+ if (!arguments.length) return _fileList;
_template = null;
- _fileList = fileList;
_geojson = null;
_src = null;
- if (!fileList || !fileList.length)
- return this;
+ _fileList = fileList;
+ if (!fileList || !fileList.length) return this;
var f2 = fileList[0];
var extension = getExtension(f2.name);
var reader = new FileReader();
- reader.onload = function() {
- return function(e) {
- drawData.setFile(extension, e.target.result);
+ reader.onload = /* @__PURE__ */ function() {
+ return function(e3) {
+ drawData.setFile(extension, e3.target.result);
};
}(f2);
reader.readAsText(f2);
@@ -46012,30 +50041,28 @@ ${content}
return _src || "";
};
drawData.fitZoom = function() {
- var features2 = getFeatures(_geojson);
- if (!features2.length)
- return;
+ var features = getFeatures(_geojson);
+ if (!features.length) return;
var map2 = context.map();
var viewport = map2.trimmedExtent().polygon();
- var coords = features2.reduce(function(coords2, feature3) {
+ var coords = features.reduce(function(coords2, feature3) {
var geom = feature3.geometry;
- if (!geom)
- return coords2;
- var c = geom.coordinates;
+ if (!geom) return coords2;
+ var c2 = geom.coordinates;
switch (geom.type) {
case "Point":
- c = [c];
+ c2 = [c2];
case "MultiPoint":
case "LineString":
break;
case "MultiPolygon":
- c = utilArrayFlatten(c);
+ c2 = utilArrayFlatten(c2);
case "Polygon":
case "MultiLineString":
- c = utilArrayFlatten(c);
+ c2 = utilArrayFlatten(c2);
break;
}
- return utilArrayUnion(coords2, c);
+ return utilArrayUnion(coords2, c2);
}, []);
if (!geoPolygonIntersectsPolygon(viewport, coords, true)) {
var extent = geoExtent(bounds_default({ type: "LineString", coordinates: coords }));
@@ -46074,17 +50101,17 @@ ${content}
let legend = context.container().select(".main-content").selectAll(".debug-legend").data(debugData.length ? [0] : []);
legend.exit().remove();
legend = legend.enter().append("div").attr("class", "fillD debug-legend").merge(legend);
- let legendItems = legend.selectAll(".debug-legend-item").data(debugData, (d) => d.label);
+ let legendItems = legend.selectAll(".debug-legend-item").data(debugData, (d2) => d2.label);
legendItems.exit().remove();
- legendItems.enter().append("span").attr("class", (d) => `debug-legend-item ${d.class}`).text((d) => d.label);
+ legendItems.enter().append("span").attr("class", (d2) => "debug-legend-item ".concat(d2.class)).text((d2) => d2.label);
let layer = selection2.selectAll(".layer-debug").data(showImagery || showDownloaded ? [0] : []);
layer.exit().remove();
layer = layer.enter().append("g").attr("class", "layer-debug").merge(layer);
const extent = context.map().extent();
- _mainFileFetcher.get("imagery").then((d) => {
- const hits = showImagery && d.query.bbox(extent.rectangle(), true) || [];
- const features2 = hits.map((d2) => d2.features[d2.id]);
- let imagery = layer.selectAll("path.debug-imagery").data(features2);
+ _mainFileFetcher.get("imagery").then((d2) => {
+ const hits = showImagery && d2.query.bbox(extent.rectangle(), true) || [];
+ const features = hits.map((d4) => d4.features[d4.id]);
+ let imagery = layer.selectAll("path.debug-imagery").data(features);
imagery.exit().remove();
imagery.enter().append("path").attr("class", "debug-imagery debug orange");
}).catch(() => {
@@ -46093,18 +50120,18 @@ ${content}
let dataDownloaded = [];
if (osm && showDownloaded) {
const rtree = osm.caches("get").tile.rtree;
- dataDownloaded = rtree.all().map((bbox) => {
+ dataDownloaded = rtree.all().map((bbox2) => {
return {
type: "Feature",
- properties: { id: bbox.id },
+ properties: { id: bbox2.id },
geometry: {
type: "Polygon",
coordinates: [[
- [bbox.minX, bbox.minY],
- [bbox.minX, bbox.maxY],
- [bbox.maxX, bbox.maxY],
- [bbox.maxX, bbox.minY],
- [bbox.minX, bbox.minY]
+ [bbox2.minX, bbox2.minY],
+ [bbox2.minX, bbox2.maxY],
+ [bbox2.maxX, bbox2.maxY],
+ [bbox2.maxX, bbox2.minY],
+ [bbox2.minX, bbox2.minY]
]]
}
};
@@ -46133,13 +50160,19 @@ ${content}
"maki-sprite",
"temaki-sprite",
"fa-sprite",
+ "roentgen-sprite",
"community-sprite"
];
function drawDefs(selection2) {
_defsSelection = selection2.append("defs");
- _defsSelection.append("marker").attr("id", "ideditor-oneway-marker").attr("viewBox", "0 0 10 5").attr("refX", 2.5).attr("refY", 2.5).attr("markerWidth", 2).attr("markerHeight", 2).attr("markerUnits", "strokeWidth").attr("orient", "auto").append("path").attr("class", "oneway-marker-path").attr("d", "M 5,3 L 0,3 L 0,2 L 5,2 L 5,0 L 10,2.5 L 5,5 z").attr("stroke", "none").attr("fill", "#000").attr("opacity", "0.75");
- function addSidedMarker(name2, color2, offset) {
- _defsSelection.append("marker").attr("id", "ideditor-sided-marker-" + name2).attr("viewBox", "0 0 2 2").attr("refX", 1).attr("refY", -offset).attr("markerWidth", 1.5).attr("markerHeight", 1.5).attr("markerUnits", "strokeWidth").attr("orient", "auto").append("path").attr("class", "sided-marker-path sided-marker-" + name2 + "-path").attr("d", "M 0,0 L 1,1 L 2,0 z").attr("stroke", "none").attr("fill", color2);
+ function addOnewayMarker(name, colour) {
+ _defsSelection.append("marker").attr("id", "ideditor-oneway-marker-".concat(name)).attr("viewBox", "0 0 10 5").attr("refX", 2.5).attr("refY", 2.5).attr("markerWidth", 2).attr("markerHeight", 2).attr("markerUnits", "strokeWidth").attr("orient", "auto").append("path").attr("class", "oneway-marker-path").attr("d", "M 5,3 L 0,3 L 0,2 L 5,2 L 5,0 L 10,2.5 L 5,5 z").attr("stroke", "none").attr("fill", colour).attr("opacity", "0.75");
+ }
+ addOnewayMarker("black", "#000");
+ addOnewayMarker("white", "#fff");
+ addOnewayMarker("pink", "#eaf");
+ function addSidedMarker(name, color2, offset) {
+ _defsSelection.append("marker").attr("id", "ideditor-sided-marker-" + name).attr("viewBox", "0 0 2 2").attr("refX", 1).attr("refY", -offset).attr("markerWidth", 1.5).attr("markerHeight", 1.5).attr("markerUnits", "strokeWidth").attr("orient", "auto").append("path").attr("class", "sided-marker-path sided-marker-" + name + "-path").attr("d", "M 0,0 L 1,1 L 2,0 z").attr("stroke", "none").attr("fill", color2);
}
addSidedMarker("natural", "rgb(170, 170, 170)", 0);
addSidedMarker("coastline", "#77dede", 1);
@@ -46149,6 +50182,7 @@ ${content}
_defsSelection.append("marker").attr("id", "ideditor-viewfield-marker").attr("viewBox", "0 0 16 16").attr("refX", 8).attr("refY", 16).attr("markerWidth", 4).attr("markerHeight", 4).attr("markerUnits", "strokeWidth").attr("orient", "auto").append("path").attr("class", "viewfield-marker-path").attr("d", "M 6,14 C 8,13.4 8,13.4 10,14 L 16,3 C 12,0 4,0 0,3 z").attr("fill", "#333").attr("fill-opacity", "0.75").attr("stroke", "#fff").attr("stroke-width", "0.5px").attr("stroke-opacity", "0.75");
_defsSelection.append("marker").attr("id", "ideditor-viewfield-marker-wireframe").attr("viewBox", "0 0 16 16").attr("refX", 8).attr("refY", 16).attr("markerWidth", 4).attr("markerHeight", 4).attr("markerUnits", "strokeWidth").attr("orient", "auto").append("path").attr("class", "viewfield-marker-path").attr("d", "M 6,14 C 8,13.4 8,13.4 10,14 L 16,3 C 12,0 4,0 0,3 z").attr("fill", "none").attr("stroke", "#fff").attr("stroke-width", "0.5px").attr("stroke-opacity", "0.75");
var patterns2 = _defsSelection.selectAll("pattern").data([
+ // pattern name, pattern image name
["beach", "dots"],
["construction", "construction"],
["cemetery", "cemetery"],
@@ -46178,35 +50212,37 @@ ${content}
["wetland_swamp", "wetland_swamp"],
["wetland_bog", "wetland_bog"],
["wetland_reedbed", "wetland_reedbed"]
- ]).enter().append("pattern").attr("id", function(d) {
- return "ideditor-pattern-" + d[0];
+ ]).enter().append("pattern").attr("id", function(d2) {
+ return "ideditor-pattern-" + d2[0];
}).attr("width", 32).attr("height", 32).attr("patternUnits", "userSpaceOnUse");
- patterns2.append("rect").attr("x", 0).attr("y", 0).attr("width", 32).attr("height", 32).attr("class", function(d) {
- return "pattern-color-" + d[0];
+ patterns2.append("rect").attr("x", 0).attr("y", 0).attr("width", 32).attr("height", 32).attr("class", function(d2) {
+ return "pattern-color-" + d2[0];
});
- patterns2.append("image").attr("x", 0).attr("y", 0).attr("width", 32).attr("height", 32).attr("xlink:href", function(d) {
- return context.imagePath("pattern/" + d[1] + ".png");
+ patterns2.append("image").attr("x", 0).attr("y", 0).attr("width", 32).attr("height", 32).attr("xlink:href", function(d2) {
+ return context.imagePath("pattern/" + d2[1] + ".png");
});
- _defsSelection.selectAll("clipPath").data([12, 18, 20, 32, 45]).enter().append("clipPath").attr("id", function(d) {
- return "ideditor-clip-square-" + d;
- }).append("rect").attr("x", 0).attr("y", 0).attr("width", function(d) {
- return d;
- }).attr("height", function(d) {
- return d;
+ _defsSelection.selectAll("clipPath").data([12, 18, 20, 32, 45]).enter().append("clipPath").attr("id", function(d2) {
+ return "ideditor-clip-square-" + d2;
+ }).append("rect").attr("x", 0).attr("y", 0).attr("width", function(d2) {
+ return d2;
+ }).attr("height", function(d2) {
+ return d2;
});
addSprites(_spritesheetIds, true);
}
function addSprites(ids, overrideColors) {
_spritesheetIds = utilArrayUniq(_spritesheetIds.concat(ids));
var spritesheets = _defsSelection.selectAll(".spritesheet").data(_spritesheetIds);
- spritesheets.enter().append("g").attr("class", function(d) {
- return "spritesheet spritesheet-" + d;
- }).each(function(d) {
- var url = context.imagePath(d + ".svg");
+ spritesheets.enter().append("g").attr("class", function(d2) {
+ return "spritesheet spritesheet-" + d2;
+ }).each(function(d2) {
+ var url = context.imagePath(d2 + ".svg");
var node = select_default2(this).node();
svg(url).then(function(svg2) {
- node.appendChild(select_default2(svg2.documentElement).attr("id", "ideditor-" + d).node());
- if (overrideColors && d !== "iD-sprite") {
+ node.appendChild(
+ select_default2(svg2.documentElement).attr("id", "ideditor-" + d2).node()
+ );
+ if (overrideColors && d2 !== "iD-sprite") {
select_default2(node).selectAll("path").attr("fill", "currentColor");
}
}).catch(function() {
@@ -46221,9 +50257,9 @@ ${content}
// modules/svg/keepRight.js
var _layerEnabled = false;
var _qaService;
- function svgKeepRight(projection2, context, dispatch10) {
- const throttledRedraw = throttle_default(() => dispatch10.call("change"), 1e3);
- const minZoom3 = 12;
+ function svgKeepRight(projection2, context, dispatch14) {
+ const throttledRedraw = throttle_default(() => dispatch14.call("change"), 1e3);
+ const minZoom5 = 12;
let touchLayer = select_default2(null);
let drawLayer = select_default2(null);
let layerVisible = false;
@@ -46255,7 +50291,7 @@ ${content}
}
function layerOn() {
editOn();
- drawLayer.style("opacity", 0).transition().duration(250).style("opacity", 1).on("end interrupt", () => dispatch10.call("change"));
+ drawLayer.style("opacity", 0).transition().duration(250).style("opacity", 1).on("end interrupt", () => dispatch14.call("change"));
}
function layerOff() {
throttledRedraw.cancel();
@@ -46263,31 +50299,29 @@ ${content}
touchLayer.selectAll(".qaItem.keepRight").remove();
drawLayer.transition().duration(250).style("opacity", 0).on("end interrupt", () => {
editOff();
- dispatch10.call("change");
+ dispatch14.call("change");
});
}
function updateMarkers() {
- if (!layerVisible || !_layerEnabled)
- return;
+ if (!layerVisible || !_layerEnabled) return;
const service = getService();
const selectedID = context.selectedErrorID();
const data = service ? service.getItems(projection2) : [];
const getTransform = svgPointTransform(projection2);
- const markers = drawLayer.selectAll(".qaItem.keepRight").data(data, (d) => d.id);
+ const markers = drawLayer.selectAll(".qaItem.keepRight").data(data, (d2) => d2.id);
markers.exit().remove();
- const markersEnter = markers.enter().append("g").attr("class", (d) => `qaItem ${d.service} itemId-${d.id} itemType-${d.parentIssueType}`);
+ const markersEnter = markers.enter().append("g").attr("class", (d2) => "qaItem ".concat(d2.service, " itemId-").concat(d2.id, " itemType-").concat(d2.parentIssueType));
markersEnter.append("ellipse").attr("cx", 0.5).attr("cy", 1).attr("rx", 6.5).attr("ry", 3).attr("class", "stroke");
markersEnter.append("path").call(markerPath, "shadow");
markersEnter.append("use").attr("class", "qaItem-fill").attr("width", "20px").attr("height", "20px").attr("x", "-8px").attr("y", "-22px").attr("xlink:href", "#iD-icon-bolt");
- markers.merge(markersEnter).sort(sortY).classed("selected", (d) => d.id === selectedID).attr("transform", getTransform);
- if (touchLayer.empty())
- return;
+ markers.merge(markersEnter).sort(sortY).classed("selected", (d2) => d2.id === selectedID).attr("transform", getTransform);
+ if (touchLayer.empty()) return;
const fillClass = context.getDebug("target") ? "pink " : "nocolor ";
- const targets = touchLayer.selectAll(".qaItem.keepRight").data(data, (d) => d.id);
+ const targets = touchLayer.selectAll(".qaItem.keepRight").data(data, (d2) => d2.id);
targets.exit().remove();
- targets.enter().append("rect").attr("width", "20px").attr("height", "20px").attr("x", "-8px").attr("y", "-22px").merge(targets).sort(sortY).attr("class", (d) => `qaItem ${d.service} target ${fillClass} itemId-${d.id}`).attr("transform", getTransform);
- function sortY(a, b) {
- return a.id === selectedID ? 1 : b.id === selectedID ? -1 : a.severity === "error" && b.severity !== "error" ? 1 : b.severity === "error" && a.severity !== "error" ? -1 : b.loc[1] - a.loc[1];
+ targets.enter().append("rect").attr("width", "20px").attr("height", "20px").attr("x", "-8px").attr("y", "-22px").merge(targets).sort(sortY).attr("class", (d2) => "qaItem ".concat(d2.service, " target ").concat(fillClass, " itemId-").concat(d2.id)).attr("transform", getTransform);
+ function sortY(a2, b2) {
+ return a2.id === selectedID ? 1 : b2.id === selectedID ? -1 : a2.severity === "error" && b2.severity !== "error" ? 1 : b2.severity === "error" && a2.severity !== "error" ? -1 : b2.loc[1] - a2.loc[1];
}
}
function drawKeepRight(selection2) {
@@ -46300,7 +50334,7 @@ ${content}
drawLayer.exit().remove();
drawLayer = drawLayer.enter().append("g").attr("class", "layer-keepRight").style("display", _layerEnabled ? "block" : "none").merge(drawLayer);
if (_layerEnabled) {
- if (service && ~~context.map().zoom() >= minZoom3) {
+ if (service && ~~context.map().zoom() >= minZoom5) {
editOn();
service.loadIssues(projection2);
updateMarkers();
@@ -46310,8 +50344,7 @@ ${content}
}
}
drawKeepRight.enabled = function(val) {
- if (!arguments.length)
- return _layerEnabled;
+ if (!arguments.length) return _layerEnabled;
_layerEnabled = val;
if (_layerEnabled) {
layerOn();
@@ -46321,7 +50354,7 @@ ${content}
context.enter(modeBrowse(context));
}
}
- dispatch10.call("change");
+ dispatch14.call("change");
return this;
};
drawKeepRight.supported = () => !!getService();
@@ -46333,8 +50366,7 @@ ${content}
var layer = select_default2(null);
var _position;
function init2() {
- if (svgGeolocate.initialized)
- return;
+ if (svgGeolocate.initialized) return;
svgGeolocate.enabled = false;
svgGeolocate.initialized = true;
}
@@ -46350,8 +50382,8 @@ ${content}
function layerOff() {
layer.style("display", "none");
}
- function transform2(d) {
- return svgPointTransform(projection2)(d);
+ function transform2(d2) {
+ return svgPointTransform(projection2)(d2);
}
function accuracy(accuracy2, loc) {
var degreesRadius = geoMetersToLat(accuracy2), tangentLoc = [loc[0], loc[1] + degreesRadius], projectedTangent = projection2(tangentLoc), projectedLoc = projection2([loc[0], loc[1]]);
@@ -46381,8 +50413,7 @@ ${content}
}
}
drawLocation.enabled = function(position, enabled) {
- if (!arguments.length)
- return svgGeolocate.enabled;
+ if (!arguments.length) return svgGeolocate.enabled;
_position = position;
svgGeolocate.enabled = enabled;
if (svgGeolocate.enabled) {
@@ -46398,13 +50429,12 @@ ${content}
}
// modules/svg/labels.js
- var import_rbush7 = __toESM(require_rbush_min());
function svgLabels(projection2, context) {
var path = path_default(projection2);
var detected = utilDetect();
var baselineHack = detected.ie || detected.browser.toLowerCase() === "edge" || detected.browser.toLowerCase() === "firefox" && detected.version >= 70;
- var _rdrawn = new import_rbush7.default();
- var _rskipped = new import_rbush7.default();
+ var _rdrawn = new RBush();
+ var _rskipped = new RBush();
var _textWidthCache = {};
var _entitybboxes = {};
var labelStack = [
@@ -46437,78 +50467,80 @@ ${content}
["point", "shop", "*", 10],
["point", "tourism", "*", 10],
["point", "camp_site", "*", 10],
+ ["line", "ref", "*", 12],
+ ["area", "ref", "*", 12],
+ ["point", "ref", "*", 10],
["line", "name", "*", 12],
["area", "name", "*", 12],
["point", "name", "*", 10]
];
function shouldSkipIcon(preset) {
var noIcons = ["building", "landuse", "natural"];
- return noIcons.some(function(s) {
- return preset.id.indexOf(s) >= 0;
+ return noIcons.some(function(s2) {
+ return preset.id.indexOf(s2) >= 0;
});
}
- function get3(array2, prop) {
- return function(d, i2) {
- return array2[i2][prop];
+ function get4(array2, prop) {
+ return function(d2, i3) {
+ return array2[i3][prop];
};
}
- function textWidth(text2, size, elem) {
- var c = _textWidthCache[size];
- if (!c)
- c = _textWidthCache[size] = {};
- if (c[text2]) {
- return c[text2];
+ function textWidth(text, size, elem) {
+ var c2 = _textWidthCache[size];
+ if (!c2) c2 = _textWidthCache[size] = {};
+ if (c2[text]) {
+ return c2[text];
} else if (elem) {
- c[text2] = elem.getComputedTextLength();
- return c[text2];
+ c2[text] = elem.getComputedTextLength();
+ return c2[text];
} else {
- var str2 = encodeURIComponent(text2).match(/%[CDEFcdef]/g);
- if (str2 === null) {
- return size / 3 * 2 * text2.length;
+ var str = encodeURIComponent(text).match(/%[CDEFcdef]/g);
+ if (str === null) {
+ return size / 3 * 2 * text.length;
} else {
- return size / 3 * (2 * text2.length + str2.length);
+ return size / 3 * (2 * text.length + str.length);
}
}
}
function drawLinePaths(selection2, entities, filter2, classes, labels) {
var paths = selection2.selectAll("path").filter(filter2).data(entities, osmEntity.key);
paths.exit().remove();
- paths.enter().append("path").style("stroke-width", get3(labels, "font-size")).attr("id", function(d) {
- return "ideditor-labelpath-" + d.id;
- }).attr("class", classes).merge(paths).attr("d", get3(labels, "lineString"));
+ paths.enter().append("path").style("stroke-width", get4(labels, "font-size")).attr("id", function(d2) {
+ return "ideditor-labelpath-" + d2.id;
+ }).attr("class", classes).merge(paths).attr("d", get4(labels, "lineString"));
}
function drawLineLabels(selection2, entities, filter2, classes, labels) {
var texts = selection2.selectAll("text." + classes).filter(filter2).data(entities, osmEntity.key);
texts.exit().remove();
- texts.enter().append("text").attr("class", function(d, i2) {
- return classes + " " + labels[i2].classes + " " + d.id;
+ texts.enter().append("text").attr("class", function(d2, i3) {
+ return classes + " " + labels[i3].classes + " " + d2.id;
}).attr("dy", baselineHack ? "0.35em" : null).append("textPath").attr("class", "textpath");
- selection2.selectAll("text." + classes).selectAll(".textpath").filter(filter2).data(entities, osmEntity.key).attr("startOffset", "50%").attr("xlink:href", function(d) {
- return "#ideditor-labelpath-" + d.id;
+ selection2.selectAll("text." + classes).selectAll(".textpath").filter(filter2).data(entities, osmEntity.key).attr("startOffset", "50%").attr("xlink:href", function(d2) {
+ return "#ideditor-labelpath-" + d2.id;
}).text(utilDisplayNameForPath);
}
function drawPointLabels(selection2, entities, filter2, classes, labels) {
var texts = selection2.selectAll("text." + classes).filter(filter2).data(entities, osmEntity.key);
texts.exit().remove();
- texts.enter().append("text").attr("class", function(d, i2) {
- return classes + " " + labels[i2].classes + " " + d.id;
- }).merge(texts).attr("x", get3(labels, "x")).attr("y", get3(labels, "y")).style("text-anchor", get3(labels, "textAnchor")).text(utilDisplayName).each(function(d, i2) {
- textWidth(utilDisplayName(d), labels[i2].height, this);
+ texts.enter().append("text").attr("class", function(d2, i3) {
+ return classes + " " + labels[i3].classes + " " + d2.id;
+ }).merge(texts).attr("x", get4(labels, "x")).attr("y", get4(labels, "y")).style("text-anchor", get4(labels, "textAnchor")).text(utilDisplayName).each(function(d2, i3) {
+ textWidth(utilDisplayName(d2), labels[i3].height, this);
});
}
function drawAreaLabels(selection2, entities, filter2, classes, labels) {
entities = entities.filter(hasText);
labels = labels.filter(hasText);
drawPointLabels(selection2, entities, filter2, classes, labels);
- function hasText(d, i2) {
- return labels[i2].hasOwnProperty("x") && labels[i2].hasOwnProperty("y");
+ function hasText(d2, i3) {
+ return labels[i3].hasOwnProperty("x") && labels[i3].hasOwnProperty("y");
}
}
function drawAreaIcons(selection2, entities, filter2, classes, labels) {
var icons = selection2.selectAll("use." + classes).filter(filter2).data(entities, osmEntity.key);
icons.exit().remove();
- icons.enter().append("use").attr("class", "icon " + classes).attr("width", "17px").attr("height", "17px").merge(icons).attr("transform", get3(labels, "transform")).attr("xlink:href", function(d) {
- var preset = _mainPresetIndex.match(d, context.graph());
+ icons.enter().append("use").attr("class", "icon " + classes).attr("width", "17px").attr("height", "17px").merge(icons).attr("transform", get4(labels, "transform")).attr("xlink:href", function(d2) {
+ var preset = _mainPresetIndex.match(d2, context.graph());
var picon = preset && preset.icon;
return picon ? "#" + picon : "";
});
@@ -46517,13 +50549,13 @@ ${content}
var classes = "debug " + which + " " + (which === "debug-skipped" ? "orange" : "yellow");
var gj = [];
if (context.getDebug("collision")) {
- gj = rtree.all().map(function(d) {
+ gj = rtree.all().map(function(d2) {
return { type: "Polygon", coordinates: [[
- [d.minX, d.minY],
- [d.maxX, d.minY],
- [d.maxX, d.maxY],
- [d.minX, d.maxY],
- [d.minX, d.minY]
+ [d2.minX, d2.minY],
+ [d2.maxX, d2.minY],
+ [d2.maxX, d2.maxY],
+ [d2.minX, d2.maxY],
+ [d2.minX, d2.minY]
]] };
});
}
@@ -46536,8 +50568,8 @@ ${content}
var zoom = geoScaleToZoom(projection2.scale());
var labelable = [];
var renderNodeAs = {};
- var i2, j2, k, entity, geometry;
- for (i2 = 0; i2 < labelStack.length; i2++) {
+ var i3, j2, k2, entity, geometry;
+ for (i3 = 0; i3 < labelStack.length; i3++) {
labelable.push([]);
}
if (fullRedraw) {
@@ -46545,8 +50577,8 @@ ${content}
_rskipped.clear();
_entitybboxes = {};
} else {
- for (i2 = 0; i2 < entities.length; i2++) {
- entity = entities[i2];
+ for (i3 = 0; i3 < entities.length; i3++) {
+ entity = entities[i3];
var toRemove = [].concat(_entitybboxes[entity.id] || []).concat(_entitybboxes[entity.id + "I"] || []);
for (j2 = 0; j2 < toRemove.length; j2++) {
_rdrawn.remove(toRemove[j2]);
@@ -46554,8 +50586,8 @@ ${content}
}
}
}
- for (i2 = 0; i2 < entities.length; i2++) {
- entity = entities[i2];
+ for (i3 = 0; i3 < entities.length; i3++) {
+ entity = entities[i3];
geometry = entity.geometry(graph);
if (geometry === "point" || geometry === "vertex" && isInterestingVertex(entity)) {
var hasDirections = entity.directions(graph, projection2).length;
@@ -46569,28 +50601,27 @@ ${content}
}
var coord2 = projection2(entity.loc);
var nodePadding = 10;
- var bbox = {
+ var bbox2 = {
minX: coord2[0] - nodePadding,
minY: coord2[1] - nodePadding - markerPadding,
maxX: coord2[0] + nodePadding,
maxY: coord2[1] + nodePadding
};
- doInsert(bbox, entity.id + "P");
+ doInsert(bbox2, entity.id + "P");
}
if (geometry === "vertex") {
geometry = "point";
}
var preset = geometry === "area" && _mainPresetIndex.match(entity, graph);
var icon2 = preset && !shouldSkipIcon(preset) && preset.icon;
- if (!icon2 && !utilDisplayName(entity))
- continue;
- for (k = 0; k < labelStack.length; k++) {
- var matchGeom = labelStack[k][0];
- var matchKey = labelStack[k][1];
- var matchVal = labelStack[k][2];
+ if (!icon2 && !utilDisplayName(entity)) continue;
+ for (k2 = 0; k2 < labelStack.length; k2++) {
+ var matchGeom = labelStack[k2][0];
+ var matchKey = labelStack[k2][1];
+ var matchVal = labelStack[k2][2];
var hasVal = entity.tags[matchKey];
if (geometry === matchGeom && hasVal && (matchVal === "*" || matchVal === hasVal)) {
- labelable[k].push(entity);
+ labelable[k2].push(entity);
break;
}
}
@@ -46605,33 +50636,31 @@ ${content}
line: [],
area: []
};
- for (k = 0; k < labelable.length; k++) {
- var fontSize = labelStack[k][3];
- for (i2 = 0; i2 < labelable[k].length; i2++) {
- entity = labelable[k][i2];
+ for (k2 = 0; k2 < labelable.length; k2++) {
+ var fontSize = labelStack[k2][3];
+ for (i3 = 0; i3 < labelable[k2].length; i3++) {
+ entity = labelable[k2][i3];
geometry = entity.geometry(graph);
var getName = geometry === "line" ? utilDisplayNameForPath : utilDisplayName;
- var name2 = getName(entity);
- var width = name2 && textWidth(name2, fontSize);
- var p = null;
+ var name = getName(entity);
+ var width = name && textWidth(name, fontSize);
+ var p2 = null;
if (geometry === "point" || geometry === "vertex") {
- if (wireframe)
- continue;
+ if (wireframe) continue;
var renderAs = renderNodeAs[entity.id];
- if (renderAs === "vertex" && zoom < 17)
- continue;
- p = getPointLabel(entity, width, fontSize, renderAs);
+ if (renderAs === "vertex" && zoom < 17) continue;
+ p2 = getPointLabel(entity, width, fontSize, renderAs);
} else if (geometry === "line") {
- p = getLineLabel(entity, width, fontSize);
+ p2 = getLineLabel(entity, width, fontSize);
} else if (geometry === "area") {
- p = getAreaLabel(entity, width, fontSize);
+ p2 = getAreaLabel(entity, width, fontSize);
}
- if (p) {
+ if (p2) {
if (geometry === "vertex") {
geometry = "point";
}
- p.classes = geometry + " tag-" + labelStack[k][1];
- positions[geometry].push(p);
+ p2.classes = geometry + " tag-" + labelStack[k2][1];
+ positions[geometry].push(p2);
labelled[geometry].push(entity);
}
}
@@ -46643,40 +50672,40 @@ ${content}
});
}
function getPointLabel(entity2, width2, height, geometry2) {
- var y = geometry2 === "point" ? -12 : 0;
+ var y2 = geometry2 === "point" ? -12 : 0;
var pointOffsets = {
- ltr: [15, y, "start"],
- rtl: [-15, y, "end"]
+ ltr: [15, y2, "start"],
+ rtl: [-15, y2, "end"]
};
var textDirection = _mainLocalizer.textDirection();
var coord3 = projection2(entity2.loc);
var textPadding = 2;
var offset = pointOffsets[textDirection];
- var p2 = {
+ var p3 = {
height,
width: width2,
x: coord3[0] + offset[0],
y: coord3[1] + offset[1],
textAnchor: offset[2]
};
- var bbox2;
+ var bbox3;
if (textDirection === "rtl") {
- bbox2 = {
- minX: p2.x - width2 - textPadding,
- minY: p2.y - height / 2 - textPadding,
- maxX: p2.x + textPadding,
- maxY: p2.y + height / 2 + textPadding
+ bbox3 = {
+ minX: p3.x - width2 - textPadding,
+ minY: p3.y - height / 2 - textPadding,
+ maxX: p3.x + textPadding,
+ maxY: p3.y + height / 2 + textPadding
};
} else {
- bbox2 = {
- minX: p2.x - textPadding,
- minY: p2.y - height / 2 - textPadding,
- maxX: p2.x + width2 + textPadding,
- maxY: p2.y + height / 2 + textPadding
+ bbox3 = {
+ minX: p3.x - textPadding,
+ minY: p3.y - height / 2 - textPadding,
+ maxX: p3.x + width2 + textPadding,
+ maxY: p3.y + height / 2 + textPadding
};
}
- if (tryInsert([bbox2], entity2.id, true)) {
- return p2;
+ if (tryInsert([bbox3], entity2.id, true)) {
+ return p3;
}
}
function getLineLabel(entity2, width2, height) {
@@ -46684,9 +50713,8 @@ ${content}
var points = graph.childNodes(entity2).map(function(node) {
return projection2(node.loc);
});
- var length = geoPathLength(points);
- if (length < width2 + 20)
- return;
+ var length2 = geoPathLength(points);
+ if (length2 < width2 + 20) return;
var lineOffsets = [
50,
45,
@@ -46709,12 +50737,11 @@ ${content}
95
];
var padding = 3;
- for (var i3 = 0; i3 < lineOffsets.length; i3++) {
- var offset = lineOffsets[i3];
- var middle = offset / 100 * length;
+ for (var i4 = 0; i4 < lineOffsets.length; i4++) {
+ var offset = lineOffsets[i4];
+ var middle = offset / 100 * length2;
var start2 = middle - width2 / 2;
- if (start2 < 0 || start2 + width2 > length)
- continue;
+ if (start2 < 0 || start2 + width2 > length2) continue;
var sub = subpath(points, start2, start2 + width2);
if (!sub || !geoPolygonIntersectsPolygon(viewport, sub, true)) {
continue;
@@ -46726,15 +50753,15 @@ ${content}
var bboxes = [];
var boxsize = (height + 2) / 2;
for (var j3 = 0; j3 < sub.length - 1; j3++) {
- var a = sub[j3];
- var b = sub[j3 + 1];
- var num = Math.max(1, Math.floor(geoVecLength(a, b) / boxsize / 2));
+ var a2 = sub[j3];
+ var b2 = sub[j3 + 1];
+ var num = Math.max(1, Math.floor(geoVecLength(a2, b2) / boxsize / 2));
for (var box = 0; box < num; box++) {
- var p2 = geoVecInterp(a, b, box / num);
- var x05 = p2[0] - boxsize - padding;
- var y05 = p2[1] - boxsize - padding;
- var x12 = p2[0] + boxsize + padding;
- var y12 = p2[1] + boxsize + padding;
+ var p3 = geoVecInterp(a2, b2, box / num);
+ var x05 = p3[0] - boxsize - padding;
+ var y05 = p3[1] - boxsize - padding;
+ var x12 = p3[0] + boxsize + padding;
+ var y12 = p3[1] + boxsize + padding;
bboxes.push({
minX: Math.min(x05, x12),
minY: Math.min(y05, y12),
@@ -46751,9 +50778,9 @@ ${content}
};
}
}
- function reverse(p3) {
- var angle2 = Math.atan2(p3[1][1] - p3[0][1], p3[1][0] - p3[0][0]);
- return !(p3[0][0] < p3[p3.length - 1][0] && angle2 < Math.PI / 2 && angle2 > -Math.PI / 2);
+ function reverse(p4) {
+ var angle2 = Math.atan2(p4[1][1] - p4[0][1], p4[1][0] - p4[0][0]);
+ return !(p4[0][0] < p4[p4.length - 1][0] && angle2 < Math.PI / 2 && angle2 > -Math.PI / 2);
}
function lineString2(points2) {
return "M" + points2.join("L");
@@ -46761,26 +50788,26 @@ ${content}
function subpath(points2, from, to) {
var sofar = 0;
var start3, end, i0, i1;
- for (var i4 = 0; i4 < points2.length - 1; i4++) {
- var a2 = points2[i4];
- var b2 = points2[i4 + 1];
- var current = geoVecLength(a2, b2);
+ for (var i5 = 0; i5 < points2.length - 1; i5++) {
+ var a3 = points2[i5];
+ var b3 = points2[i5 + 1];
+ var current = geoVecLength(a3, b3);
var portion;
if (!start3 && sofar + current >= from) {
portion = (from - sofar) / current;
start3 = [
- a2[0] + portion * (b2[0] - a2[0]),
- a2[1] + portion * (b2[1] - a2[1])
+ a3[0] + portion * (b3[0] - a3[0]),
+ a3[1] + portion * (b3[1] - a3[1])
];
- i0 = i4 + 1;
+ i0 = i5 + 1;
}
if (!end && sofar + current >= to) {
portion = (to - sofar) / current;
end = [
- a2[0] + portion * (b2[0] - a2[0]),
- a2[1] + portion * (b2[1] - a2[1])
+ a3[0] + portion * (b3[0] - a3[0]),
+ a3[1] + portion * (b3[1] - a3[1])
];
- i1 = i4 + 1;
+ i1 = i5 + 1;
}
sofar += current;
}
@@ -46794,34 +50821,33 @@ ${content}
var centroid = path.centroid(entity2.asGeoJSON(graph));
var extent = entity2.extent(graph);
var areaWidth = projection2(extent[1])[0] - projection2(extent[0])[0];
- if (isNaN(centroid[0]) || areaWidth < 20)
- return;
+ if (isNaN(centroid[0]) || areaWidth < 20) return;
var preset2 = _mainPresetIndex.match(entity2, context.graph());
var picon = preset2 && preset2.icon;
var iconSize = 17;
var padding = 2;
- var p2 = {};
+ var p3 = {};
if (picon) {
if (addIcon()) {
addLabel(iconSize + padding);
- return p2;
+ return p3;
}
} else {
if (addLabel(0)) {
- return p2;
+ return p3;
}
}
function addIcon() {
var iconX = centroid[0] - iconSize / 2;
var iconY = centroid[1] - iconSize / 2;
- var bbox2 = {
+ var bbox3 = {
minX: iconX,
minY: iconY,
maxX: iconX + iconSize,
maxY: iconY + iconSize
};
- if (tryInsert([bbox2], entity2.id + "I", true)) {
- p2.transform = "translate(" + iconX + "," + iconY + ")";
+ if (tryInsert([bbox3], entity2.id + "I", true)) {
+ p3.transform = "translate(" + iconX + "," + iconY + ")";
return true;
}
return false;
@@ -46830,42 +50856,42 @@ ${content}
if (width2 && areaWidth >= width2 + 20) {
var labelX = centroid[0];
var labelY = centroid[1] + yOffset;
- var bbox2 = {
+ var bbox3 = {
minX: labelX - width2 / 2 - padding,
minY: labelY - height / 2 - padding,
maxX: labelX + width2 / 2 + padding,
maxY: labelY + height / 2 + padding
};
- if (tryInsert([bbox2], entity2.id, true)) {
- p2.x = labelX;
- p2.y = labelY;
- p2.textAnchor = "middle";
- p2.height = height;
+ if (tryInsert([bbox3], entity2.id, true)) {
+ p3.x = labelX;
+ p3.y = labelY;
+ p3.textAnchor = "middle";
+ p3.height = height;
return true;
}
}
return false;
}
}
- function doInsert(bbox2, id2) {
- bbox2.id = id2;
+ function doInsert(bbox3, id2) {
+ bbox3.id = id2;
var oldbox = _entitybboxes[id2];
if (oldbox) {
_rdrawn.remove(oldbox);
}
- _entitybboxes[id2] = bbox2;
- _rdrawn.insert(bbox2);
+ _entitybboxes[id2] = bbox3;
+ _rdrawn.insert(bbox3);
}
function tryInsert(bboxes, id2, saveSkipped) {
var skipped = false;
- for (var i3 = 0; i3 < bboxes.length; i3++) {
- var bbox2 = bboxes[i3];
- bbox2.id = id2;
- if (bbox2.minX < 0 || bbox2.minY < 0 || bbox2.maxX > dimensions[0] || bbox2.maxY > dimensions[1]) {
+ for (var i4 = 0; i4 < bboxes.length; i4++) {
+ var bbox3 = bboxes[i4];
+ bbox3.id = id2;
+ if (bbox3.minX < 0 || bbox3.minY < 0 || bbox3.maxX > dimensions[0] || bbox3.maxY > dimensions[1]) {
skipped = true;
break;
}
- if (_rdrawn.collides(bbox2)) {
+ if (_rdrawn.collides(bbox3)) {
skipped = true;
break;
}
@@ -46881,8 +50907,8 @@ ${content}
return !skipped;
}
var layer = selection2.selectAll(".layer-osm.labels");
- layer.selectAll(".labels-group").data(["halo", "label", "debug"]).enter().append("g").attr("class", function(d) {
- return "labels-group " + d;
+ layer.selectAll(".labels-group").data(["halo", "label", "debug"]).enter().append("g").attr("class", function(d2) {
+ return "labels-group " + d2;
});
var halo = layer.selectAll(".labels-group.halo");
var label = layer.selectAll(".labels-group.label");
@@ -46905,6656 +50931,6931 @@ ${content}
var layers = drawLayer.selectAll(".labels-group.halo, .labels-group.label");
layers.selectAll(".nolabel").classed("nolabel", false);
var mouse = context.map().mouse();
- var graph = context.graph();
- var selectedIDs = context.selectedIDs();
- var ids = [];
- var pad2, bbox;
- if (mouse) {
- pad2 = 20;
- bbox = { minX: mouse[0] - pad2, minY: mouse[1] - pad2, maxX: mouse[0] + pad2, maxY: mouse[1] + pad2 };
- var nearMouse = _rdrawn.search(bbox).map(function(entity2) {
- return entity2.id;
- });
- ids.push.apply(ids, nearMouse);
- }
- for (var i2 = 0; i2 < selectedIDs.length; i2++) {
- var entity = graph.hasEntity(selectedIDs[i2]);
- if (entity && entity.type === "node") {
- ids.push(selectedIDs[i2]);
- }
- }
- layers.selectAll(utilEntitySelector(ids)).classed("nolabel", true);
- var debug2 = selection2.selectAll(".labels-group.debug");
- var gj = [];
- if (context.getDebug("collision")) {
- gj = bbox ? [{
- type: "Polygon",
- coordinates: [[
- [bbox.minX, bbox.minY],
- [bbox.maxX, bbox.minY],
- [bbox.maxX, bbox.maxY],
- [bbox.minX, bbox.maxY],
- [bbox.minX, bbox.minY]
- ]]
- }] : [];
- }
- var box = debug2.selectAll(".debug-mouse").data(gj);
- box.exit().remove();
- box.enter().append("path").attr("class", "debug debug-mouse yellow").merge(box).attr("d", path_default());
- }
- var throttleFilterLabels = throttle_default(filterLabels, 100);
- drawLabels.observe = function(selection2) {
- var listener = function() {
- throttleFilterLabels(selection2);
- };
- selection2.on("mousemove.hidelabels", listener);
- context.on("enter.hidelabels", listener);
- };
- drawLabels.off = function(selection2) {
- throttleFilterLabels.cancel();
- selection2.on("mousemove.hidelabels", null);
- context.on("enter.hidelabels", null);
- };
- return drawLabels;
- }
-
- // modules/svg/improveOSM.js
- var _layerEnabled2 = false;
- var _qaService2;
- function svgImproveOSM(projection2, context, dispatch10) {
- const throttledRedraw = throttle_default(() => dispatch10.call("change"), 1e3);
- const minZoom3 = 12;
- let touchLayer = select_default2(null);
- let drawLayer = select_default2(null);
- let layerVisible = false;
- function markerPath(selection2, klass) {
- selection2.attr("class", klass).attr("transform", "translate(-10, -28)").attr("points", "16,3 4,3 1,6 1,17 4,20 7,20 10,27 13,20 16,20 19,17.033 19,6");
- }
- function getService() {
- if (services.improveOSM && !_qaService2) {
- _qaService2 = services.improveOSM;
- _qaService2.on("loaded", throttledRedraw);
- } else if (!services.improveOSM && _qaService2) {
- _qaService2 = null;
- }
- return _qaService2;
- }
- function editOn() {
- if (!layerVisible) {
- layerVisible = true;
- drawLayer.style("display", "block");
- }
- }
- function editOff() {
- if (layerVisible) {
- layerVisible = false;
- drawLayer.style("display", "none");
- drawLayer.selectAll(".qaItem.improveOSM").remove();
- touchLayer.selectAll(".qaItem.improveOSM").remove();
- }
- }
- function layerOn() {
- editOn();
- drawLayer.style("opacity", 0).transition().duration(250).style("opacity", 1).on("end interrupt", () => dispatch10.call("change"));
- }
- function layerOff() {
- throttledRedraw.cancel();
- drawLayer.interrupt();
- touchLayer.selectAll(".qaItem.improveOSM").remove();
- drawLayer.transition().duration(250).style("opacity", 0).on("end interrupt", () => {
- editOff();
- dispatch10.call("change");
- });
- }
- function updateMarkers() {
- if (!layerVisible || !_layerEnabled2)
- return;
- const service = getService();
- const selectedID = context.selectedErrorID();
- const data = service ? service.getItems(projection2) : [];
- const getTransform = svgPointTransform(projection2);
- const markers = drawLayer.selectAll(".qaItem.improveOSM").data(data, (d) => d.id);
- markers.exit().remove();
- const markersEnter = markers.enter().append("g").attr("class", (d) => `qaItem ${d.service} itemId-${d.id} itemType-${d.itemType}`);
- markersEnter.append("polygon").call(markerPath, "shadow");
- markersEnter.append("ellipse").attr("cx", 0).attr("cy", 0).attr("rx", 4.5).attr("ry", 2).attr("class", "stroke");
- markersEnter.append("polygon").attr("fill", "currentColor").call(markerPath, "qaItem-fill");
- markersEnter.append("use").attr("class", "icon-annotation").attr("transform", "translate(-6, -22)").attr("width", "12px").attr("height", "12px").attr("xlink:href", (d) => d.icon ? "#" + d.icon : "");
- markers.merge(markersEnter).sort(sortY).classed("selected", (d) => d.id === selectedID).attr("transform", getTransform);
- if (touchLayer.empty())
- return;
- const fillClass = context.getDebug("target") ? "pink " : "nocolor ";
- const targets = touchLayer.selectAll(".qaItem.improveOSM").data(data, (d) => d.id);
- targets.exit().remove();
- targets.enter().append("rect").attr("width", "20px").attr("height", "30px").attr("x", "-10px").attr("y", "-28px").merge(targets).sort(sortY).attr("class", (d) => `qaItem ${d.service} target ${fillClass} itemId-${d.id}`).attr("transform", getTransform);
- function sortY(a, b) {
- return a.id === selectedID ? 1 : b.id === selectedID ? -1 : b.loc[1] - a.loc[1];
- }
- }
- function drawImproveOSM(selection2) {
- const service = getService();
- const surface = context.surface();
- if (surface && !surface.empty()) {
- touchLayer = surface.selectAll(".data-layer.touch .layer-touch.markers");
- }
- drawLayer = selection2.selectAll(".layer-improveOSM").data(service ? [0] : []);
- drawLayer.exit().remove();
- drawLayer = drawLayer.enter().append("g").attr("class", "layer-improveOSM").style("display", _layerEnabled2 ? "block" : "none").merge(drawLayer);
- if (_layerEnabled2) {
- if (service && ~~context.map().zoom() >= minZoom3) {
- editOn();
- service.loadIssues(projection2);
- updateMarkers();
- } else {
- editOff();
- }
- }
- }
- drawImproveOSM.enabled = function(val) {
- if (!arguments.length)
- return _layerEnabled2;
- _layerEnabled2 = val;
- if (_layerEnabled2) {
- layerOn();
- } else {
- layerOff();
- if (context.selectedErrorID()) {
- context.enter(modeBrowse(context));
- }
- }
- dispatch10.call("change");
- return this;
- };
- drawImproveOSM.supported = () => !!getService();
- return drawImproveOSM;
- }
-
- // modules/svg/osmose.js
- var _layerEnabled3 = false;
- var _qaService3;
- function svgOsmose(projection2, context, dispatch10) {
- const throttledRedraw = throttle_default(() => dispatch10.call("change"), 1e3);
- const minZoom3 = 12;
- let touchLayer = select_default2(null);
- let drawLayer = select_default2(null);
- let layerVisible = false;
- function markerPath(selection2, klass) {
- selection2.attr("class", klass).attr("transform", "translate(-10, -28)").attr("points", "16,3 4,3 1,6 1,17 4,20 7,20 10,27 13,20 16,20 19,17.033 19,6");
- }
- function getService() {
- if (services.osmose && !_qaService3) {
- _qaService3 = services.osmose;
- _qaService3.on("loaded", throttledRedraw);
- } else if (!services.osmose && _qaService3) {
- _qaService3 = null;
- }
- return _qaService3;
- }
- function editOn() {
- if (!layerVisible) {
- layerVisible = true;
- drawLayer.style("display", "block");
- }
- }
- function editOff() {
- if (layerVisible) {
- layerVisible = false;
- drawLayer.style("display", "none");
- drawLayer.selectAll(".qaItem.osmose").remove();
- touchLayer.selectAll(".qaItem.osmose").remove();
- }
- }
- function layerOn() {
- editOn();
- drawLayer.style("opacity", 0).transition().duration(250).style("opacity", 1).on("end interrupt", () => dispatch10.call("change"));
- }
- function layerOff() {
- throttledRedraw.cancel();
- drawLayer.interrupt();
- touchLayer.selectAll(".qaItem.osmose").remove();
- drawLayer.transition().duration(250).style("opacity", 0).on("end interrupt", () => {
- editOff();
- dispatch10.call("change");
- });
- }
- function updateMarkers() {
- if (!layerVisible || !_layerEnabled3)
- return;
- const service = getService();
- const selectedID = context.selectedErrorID();
- const data = service ? service.getItems(projection2) : [];
- const getTransform = svgPointTransform(projection2);
- const markers = drawLayer.selectAll(".qaItem.osmose").data(data, (d) => d.id);
- markers.exit().remove();
- const markersEnter = markers.enter().append("g").attr("class", (d) => `qaItem ${d.service} itemId-${d.id} itemType-${d.itemType}`);
- markersEnter.append("polygon").call(markerPath, "shadow");
- markersEnter.append("ellipse").attr("cx", 0).attr("cy", 0).attr("rx", 4.5).attr("ry", 2).attr("class", "stroke");
- markersEnter.append("polygon").attr("fill", (d) => service.getColor(d.item)).call(markerPath, "qaItem-fill");
- markersEnter.append("use").attr("class", "icon-annotation").attr("transform", "translate(-6, -22)").attr("width", "12px").attr("height", "12px").attr("xlink:href", (d) => d.icon ? "#" + d.icon : "");
- markers.merge(markersEnter).sort(sortY).classed("selected", (d) => d.id === selectedID).attr("transform", getTransform);
- if (touchLayer.empty())
- return;
- const fillClass = context.getDebug("target") ? "pink" : "nocolor";
- const targets = touchLayer.selectAll(".qaItem.osmose").data(data, (d) => d.id);
- targets.exit().remove();
- targets.enter().append("rect").attr("width", "20px").attr("height", "30px").attr("x", "-10px").attr("y", "-28px").merge(targets).sort(sortY).attr("class", (d) => `qaItem ${d.service} target ${fillClass} itemId-${d.id}`).attr("transform", getTransform);
- function sortY(a, b) {
- return a.id === selectedID ? 1 : b.id === selectedID ? -1 : b.loc[1] - a.loc[1];
- }
- }
- function drawOsmose(selection2) {
- const service = getService();
- const surface = context.surface();
- if (surface && !surface.empty()) {
- touchLayer = surface.selectAll(".data-layer.touch .layer-touch.markers");
- }
- drawLayer = selection2.selectAll(".layer-osmose").data(service ? [0] : []);
- drawLayer.exit().remove();
- drawLayer = drawLayer.enter().append("g").attr("class", "layer-osmose").style("display", _layerEnabled3 ? "block" : "none").merge(drawLayer);
- if (_layerEnabled3) {
- if (service && ~~context.map().zoom() >= minZoom3) {
- editOn();
- service.loadIssues(projection2);
- updateMarkers();
- } else {
- editOff();
- }
- }
- }
- drawOsmose.enabled = function(val) {
- if (!arguments.length)
- return _layerEnabled3;
- _layerEnabled3 = val;
- if (_layerEnabled3) {
- getService().loadStrings().then(layerOn).catch((err) => {
- console.log(err);
- });
- } else {
- layerOff();
- if (context.selectedErrorID()) {
- context.enter(modeBrowse(context));
- }
- }
- dispatch10.call("change");
- return this;
- };
- drawOsmose.supported = () => !!getService();
- return drawOsmose;
- }
-
- // modules/svg/streetside.js
- function svgStreetside(projection2, context, dispatch10) {
- var throttledRedraw = throttle_default(function() {
- dispatch10.call("change");
- }, 1e3);
- var minZoom3 = 14;
- var minMarkerZoom = 16;
- var minViewfieldZoom = 18;
- var layer = select_default2(null);
- var _viewerYaw = 0;
- var _selectedSequence = null;
- var _streetside;
- function init2() {
- if (svgStreetside.initialized)
- return;
- svgStreetside.enabled = false;
- svgStreetside.initialized = true;
- }
- function getService() {
- if (services.streetside && !_streetside) {
- _streetside = services.streetside;
- _streetside.event.on("viewerChanged.svgStreetside", viewerChanged).on("loadedImages.svgStreetside", throttledRedraw);
- } else if (!services.streetside && _streetside) {
- _streetside = null;
- }
- return _streetside;
- }
- function showLayer() {
- var service = getService();
- if (!service)
- return;
- editOn();
- layer.style("opacity", 0).transition().duration(250).style("opacity", 1).on("end", function() {
- dispatch10.call("change");
- });
- }
- function hideLayer() {
- throttledRedraw.cancel();
- layer.transition().duration(250).style("opacity", 0).on("end", editOff);
- }
- function editOn() {
- layer.style("display", "block");
- }
- function editOff() {
- layer.selectAll(".viewfield-group").remove();
- layer.style("display", "none");
- }
- function click(d3_event, d) {
- var service = getService();
- if (!service)
- return;
- if (d.sequenceKey !== _selectedSequence) {
- _viewerYaw = 0;
- }
- _selectedSequence = d.sequenceKey;
- service.ensureViewerLoaded(context).then(function() {
- service.selectImage(context, d.key).yaw(_viewerYaw).showViewer(context);
- });
- context.map().centerEase(d.loc);
- }
- function mouseover(d3_event, d) {
- var service = getService();
- if (service)
- service.setStyles(context, d);
- }
- function mouseout() {
- var service = getService();
- if (service)
- service.setStyles(context, null);
- }
- function transform2(d) {
- var t = svgPointTransform(projection2)(d);
- var rot = d.ca + _viewerYaw;
- if (rot) {
- t += " rotate(" + Math.floor(rot) + ",0,0)";
- }
- return t;
- }
- function viewerChanged() {
- var service = getService();
- if (!service)
- return;
- var viewer = service.viewer();
- if (!viewer)
- return;
- _viewerYaw = viewer.getYaw();
- if (context.map().isTransformed())
- return;
- layer.selectAll(".viewfield-group.currentView").attr("transform", transform2);
- }
- function filterBubbles(bubbles) {
- var fromDate = context.photos().fromDate();
- var toDate = context.photos().toDate();
- var usernames = context.photos().usernames();
- if (fromDate) {
- var fromTimestamp = new Date(fromDate).getTime();
- bubbles = bubbles.filter(function(bubble) {
- return new Date(bubble.captured_at).getTime() >= fromTimestamp;
- });
- }
- if (toDate) {
- var toTimestamp = new Date(toDate).getTime();
- bubbles = bubbles.filter(function(bubble) {
- return new Date(bubble.captured_at).getTime() <= toTimestamp;
- });
- }
- if (usernames) {
- bubbles = bubbles.filter(function(bubble) {
- return usernames.indexOf(bubble.captured_by) !== -1;
- });
- }
- return bubbles;
- }
- function filterSequences(sequences) {
- var fromDate = context.photos().fromDate();
- var toDate = context.photos().toDate();
- var usernames = context.photos().usernames();
- if (fromDate) {
- var fromTimestamp = new Date(fromDate).getTime();
- sequences = sequences.filter(function(sequences2) {
- return new Date(sequences2.properties.captured_at).getTime() >= fromTimestamp;
- });
- }
- if (toDate) {
- var toTimestamp = new Date(toDate).getTime();
- sequences = sequences.filter(function(sequences2) {
- return new Date(sequences2.properties.captured_at).getTime() <= toTimestamp;
- });
- }
- if (usernames) {
- sequences = sequences.filter(function(sequences2) {
- return usernames.indexOf(sequences2.properties.captured_by) !== -1;
- });
- }
- return sequences;
- }
- function update() {
- var viewer = context.container().select(".photoviewer");
- var selected = viewer.empty() ? void 0 : viewer.datum();
- var z = ~~context.map().zoom();
- var showMarkers = z >= minMarkerZoom;
- var showViewfields = z >= minViewfieldZoom;
- var service = getService();
- var sequences = [];
- var bubbles = [];
- if (context.photos().showsPanoramic()) {
- sequences = service ? service.sequences(projection2) : [];
- bubbles = service && showMarkers ? service.bubbles(projection2) : [];
- sequences = filterSequences(sequences);
- bubbles = filterBubbles(bubbles);
- }
- var traces = layer.selectAll(".sequences").selectAll(".sequence").data(sequences, function(d) {
- return d.properties.key;
- });
- traces.exit().remove();
- traces = traces.enter().append("path").attr("class", "sequence").merge(traces).attr("d", svgPath(projection2).geojson);
- var groups = layer.selectAll(".markers").selectAll(".viewfield-group").data(bubbles, function(d) {
- return d.key + (d.sequenceKey ? "v1" : "v0");
- });
- groups.exit().remove();
- var groupsEnter = groups.enter().append("g").attr("class", "viewfield-group").on("mouseenter", mouseover).on("mouseleave", mouseout).on("click", click);
- groupsEnter.append("g").attr("class", "viewfield-scale");
- var markers = groups.merge(groupsEnter).sort(function(a, b) {
- return a === selected ? 1 : b === selected ? -1 : b.loc[1] - a.loc[1];
- }).attr("transform", transform2).select(".viewfield-scale");
- markers.selectAll("circle").data([0]).enter().append("circle").attr("dx", "0").attr("dy", "0").attr("r", "6");
- var viewfields = markers.selectAll(".viewfield").data(showViewfields ? [0] : []);
- viewfields.exit().remove();
- viewfields.enter().insert("path", "circle").attr("class", "viewfield").attr("transform", "scale(1.5,1.5),translate(-8, -13)").attr("d", viewfieldPath);
- function viewfieldPath() {
- var d = this.parentNode.__data__;
- if (d.pano) {
- return "M 8,13 m -10,0 a 10,10 0 1,0 20,0 a 10,10 0 1,0 -20,0";
- } else {
- return "M 6,9 C 8,8.4 8,8.4 10,9 L 16,-2 C 12,-5 4,-5 0,-2 z";
- }
+ var graph = context.graph();
+ var selectedIDs = context.selectedIDs();
+ var ids = [];
+ var pad2, bbox2;
+ if (mouse) {
+ pad2 = 20;
+ bbox2 = { minX: mouse[0] - pad2, minY: mouse[1] - pad2, maxX: mouse[0] + pad2, maxY: mouse[1] + pad2 };
+ var nearMouse = _rdrawn.search(bbox2).map(function(entity2) {
+ return entity2.id;
+ });
+ ids.push.apply(ids, nearMouse);
}
- }
- function drawImages(selection2) {
- var enabled = svgStreetside.enabled;
- var service = getService();
- layer = selection2.selectAll(".layer-streetside-images").data(service ? [0] : []);
- layer.exit().remove();
- var layerEnter = layer.enter().append("g").attr("class", "layer-streetside-images").style("display", enabled ? "block" : "none");
- layerEnter.append("g").attr("class", "sequences");
- layerEnter.append("g").attr("class", "markers");
- layer = layerEnter.merge(layer);
- if (enabled) {
- if (service && ~~context.map().zoom() >= minZoom3) {
- editOn();
- update();
- service.loadBubbles(projection2);
- } else {
- editOff();
+ for (var i3 = 0; i3 < selectedIDs.length; i3++) {
+ var entity = graph.hasEntity(selectedIDs[i3]);
+ if (entity && entity.type === "node") {
+ ids.push(selectedIDs[i3]);
}
}
- }
- drawImages.enabled = function(_) {
- if (!arguments.length)
- return svgStreetside.enabled;
- svgStreetside.enabled = _;
- if (svgStreetside.enabled) {
- showLayer();
- context.photos().on("change.streetside", update);
- } else {
- hideLayer();
- context.photos().on("change.streetside", null);
+ layers.selectAll(utilEntitySelector(ids)).classed("nolabel", true);
+ var debug2 = selection2.selectAll(".labels-group.debug");
+ var gj = [];
+ if (context.getDebug("collision")) {
+ gj = bbox2 ? [{
+ type: "Polygon",
+ coordinates: [[
+ [bbox2.minX, bbox2.minY],
+ [bbox2.maxX, bbox2.minY],
+ [bbox2.maxX, bbox2.maxY],
+ [bbox2.minX, bbox2.maxY],
+ [bbox2.minX, bbox2.minY]
+ ]]
+ }] : [];
}
- dispatch10.call("change");
- return this;
+ var box = debug2.selectAll(".debug-mouse").data(gj);
+ box.exit().remove();
+ box.enter().append("path").attr("class", "debug debug-mouse yellow").merge(box).attr("d", path_default());
+ }
+ var throttleFilterLabels = throttle_default(filterLabels, 100);
+ drawLabels.observe = function(selection2) {
+ var listener = function() {
+ throttleFilterLabels(selection2);
+ };
+ selection2.on("mousemove.hidelabels", listener);
+ context.on("enter.hidelabels", listener);
};
- drawImages.supported = function() {
- return !!getService();
+ drawLabels.off = function(selection2) {
+ throttleFilterLabels.cancel();
+ selection2.on("mousemove.hidelabels", null);
+ context.on("enter.hidelabels", null);
};
- init2();
- return drawImages;
+ return drawLabels;
}
- // modules/svg/mapillary_images.js
- function svgMapillaryImages(projection2, context, dispatch10) {
- const throttledRedraw = throttle_default(function() {
- dispatch10.call("change");
- }, 1e3);
- const minZoom3 = 12;
- const minMarkerZoom = 16;
- const minViewfieldZoom = 18;
- let layer = select_default2(null);
- let _mapillary;
- function init2() {
- if (svgMapillaryImages.initialized)
- return;
- svgMapillaryImages.enabled = false;
- svgMapillaryImages.initialized = true;
+ // node_modules/exifr/dist/full.esm.mjs
+ var e = "undefined" != typeof self ? self : global;
+ var t = "undefined" != typeof navigator;
+ var i2 = t && "undefined" == typeof HTMLImageElement;
+ var n2 = !("undefined" == typeof global || "undefined" == typeof process || !process.versions || !process.versions.node);
+ var s = e.Buffer;
+ var r = e.BigInt;
+ var a = !!s;
+ var o = (e3) => e3;
+ function l(e3, t2 = o) {
+ if (n2) try {
+ return "function" == typeof __require ? Promise.resolve(t2(__require(e3))) : import(
+ /* webpackIgnore: true */
+ e3
+ ).then(t2);
+ } catch (t3) {
+ console.warn("Couldn't load ".concat(e3));
+ }
+ }
+ var h = e.fetch;
+ var u = (e3) => h = e3;
+ if (!e.fetch) {
+ const e3 = l("http", (e4) => e4), t2 = l("https", (e4) => e4), i3 = (n3, { headers: s2 } = {}) => new Promise(async (r2, a2) => {
+ let { port: o2, hostname: l2, pathname: h2, protocol: u2, search: c2 } = new URL(n3);
+ const f2 = { method: "GET", hostname: l2, path: encodeURI(h2) + c2, headers: s2 };
+ "" !== o2 && (f2.port = Number(o2));
+ const d2 = ("https:" === u2 ? await t2 : await e3).request(f2, (e4) => {
+ if (301 === e4.statusCode || 302 === e4.statusCode) {
+ let t3 = new URL(e4.headers.location, n3).toString();
+ return i3(t3, { headers: s2 }).then(r2).catch(a2);
+ }
+ r2({ status: e4.statusCode, arrayBuffer: () => new Promise((t3) => {
+ let i4 = [];
+ e4.on("data", (e6) => i4.push(e6)), e4.on("end", () => t3(Buffer.concat(i4)));
+ }) });
+ });
+ d2.on("error", a2), d2.end();
+ });
+ u(i3);
+ }
+ function c(e3, t2, i3) {
+ return t2 in e3 ? Object.defineProperty(e3, t2, { value: i3, enumerable: true, configurable: true, writable: true }) : e3[t2] = i3, e3;
+ }
+ var f = (e3) => p(e3) ? void 0 : e3;
+ var d = (e3) => void 0 !== e3;
+ function p(e3) {
+ return void 0 === e3 || (e3 instanceof Map ? 0 === e3.size : 0 === Object.values(e3).filter(d).length);
+ }
+ function g2(e3) {
+ let t2 = new Error(e3);
+ throw delete t2.stack, t2;
+ }
+ function m(e3) {
+ return "" === (e3 = function(e4) {
+ for (; e4.endsWith("\0"); ) e4 = e4.slice(0, -1);
+ return e4;
+ }(e3).trim()) ? void 0 : e3;
+ }
+ function S(e3) {
+ let t2 = function(e4) {
+ let t3 = 0;
+ return e4.ifd0.enabled && (t3 += 1024), e4.exif.enabled && (t3 += 2048), e4.makerNote && (t3 += 2048), e4.userComment && (t3 += 1024), e4.gps.enabled && (t3 += 512), e4.interop.enabled && (t3 += 100), e4.ifd1.enabled && (t3 += 1024), t3 + 2048;
+ }(e3);
+ return e3.jfif.enabled && (t2 += 50), e3.xmp.enabled && (t2 += 2e4), e3.iptc.enabled && (t2 += 14e3), e3.icc.enabled && (t2 += 6e3), t2;
+ }
+ var C = (e3) => String.fromCharCode.apply(null, e3);
+ var y = "undefined" != typeof TextDecoder ? new TextDecoder("utf-8") : void 0;
+ function b(e3) {
+ return y ? y.decode(e3) : a ? Buffer.from(e3).toString("utf8") : decodeURIComponent(escape(C(e3)));
+ }
+ var I = class _I {
+ static from(e3, t2) {
+ return e3 instanceof this && e3.le === t2 ? e3 : new _I(e3, void 0, void 0, t2);
+ }
+ constructor(e3, t2 = 0, i3, n3) {
+ if ("boolean" == typeof n3 && (this.le = n3), Array.isArray(e3) && (e3 = new Uint8Array(e3)), 0 === e3) this.byteOffset = 0, this.byteLength = 0;
+ else if (e3 instanceof ArrayBuffer) {
+ void 0 === i3 && (i3 = e3.byteLength - t2);
+ let n4 = new DataView(e3, t2, i3);
+ this._swapDataView(n4);
+ } else if (e3 instanceof Uint8Array || e3 instanceof DataView || e3 instanceof _I) {
+ void 0 === i3 && (i3 = e3.byteLength - t2), (t2 += e3.byteOffset) + i3 > e3.byteOffset + e3.byteLength && g2("Creating view outside of available memory in ArrayBuffer");
+ let n4 = new DataView(e3.buffer, t2, i3);
+ this._swapDataView(n4);
+ } else if ("number" == typeof e3) {
+ let t3 = new DataView(new ArrayBuffer(e3));
+ this._swapDataView(t3);
+ } else g2("Invalid input argument for BufferView: " + e3);
}
- function getService() {
- if (services.mapillary && !_mapillary) {
- _mapillary = services.mapillary;
- _mapillary.event.on("loadedImages", throttledRedraw);
- } else if (!services.mapillary && _mapillary) {
- _mapillary = null;
- }
- return _mapillary;
+ _swapArrayBuffer(e3) {
+ this._swapDataView(new DataView(e3));
}
- function showLayer() {
- const service = getService();
- if (!service)
- return;
- editOn();
- layer.style("opacity", 0).transition().duration(250).style("opacity", 1).on("end", function() {
- dispatch10.call("change");
- });
+ _swapBuffer(e3) {
+ this._swapDataView(new DataView(e3.buffer, e3.byteOffset, e3.byteLength));
}
- function hideLayer() {
- throttledRedraw.cancel();
- layer.transition().duration(250).style("opacity", 0).on("end", editOff);
+ _swapDataView(e3) {
+ this.dataView = e3, this.buffer = e3.buffer, this.byteOffset = e3.byteOffset, this.byteLength = e3.byteLength;
}
- function editOn() {
- layer.style("display", "block");
+ _lengthToEnd(e3) {
+ return this.byteLength - e3;
}
- function editOff() {
- layer.selectAll(".viewfield-group").remove();
- layer.style("display", "none");
+ set(e3, t2, i3 = _I) {
+ return e3 instanceof DataView || e3 instanceof _I ? e3 = new Uint8Array(e3.buffer, e3.byteOffset, e3.byteLength) : e3 instanceof ArrayBuffer && (e3 = new Uint8Array(e3)), e3 instanceof Uint8Array || g2("BufferView.set(): Invalid data argument."), this.toUint8().set(e3, t2), new i3(this, t2, e3.byteLength);
}
- function click(d3_event, image) {
- const service = getService();
- if (!service)
- return;
- service.ensureViewerLoaded(context).then(function() {
- service.selectImage(context, image.id).showViewer(context);
- });
- context.map().centerEase(image.loc);
+ subarray(e3, t2) {
+ return t2 = t2 || this._lengthToEnd(e3), new _I(this, e3, t2);
}
- function mouseover(d3_event, image) {
- const service = getService();
- if (service)
- service.setStyles(context, image);
+ toUint8() {
+ return new Uint8Array(this.buffer, this.byteOffset, this.byteLength);
}
- function mouseout() {
- const service = getService();
- if (service)
- service.setStyles(context, null);
+ getUint8Array(e3, t2) {
+ return new Uint8Array(this.buffer, this.byteOffset + e3, t2);
}
- function transform2(d) {
- let t = svgPointTransform(projection2)(d);
- if (d.ca) {
- t += " rotate(" + Math.floor(d.ca) + ",0,0)";
- }
- return t;
+ getString(e3 = 0, t2 = this.byteLength) {
+ return b(this.getUint8Array(e3, t2));
}
- function filterImages(images) {
- const showsPano = context.photos().showsPanoramic();
- const showsFlat = context.photos().showsFlat();
- const fromDate = context.photos().fromDate();
- const toDate = context.photos().toDate();
- if (!showsPano || !showsFlat) {
- images = images.filter(function(image) {
- if (image.is_pano)
- return showsPano;
- return showsFlat;
- });
- }
- if (fromDate) {
- images = images.filter(function(image) {
- return new Date(image.captured_at).getTime() >= new Date(fromDate).getTime();
- });
- }
- if (toDate) {
- images = images.filter(function(image) {
- return new Date(image.captured_at).getTime() <= new Date(toDate).getTime();
- });
- }
- return images;
+ getLatin1String(e3 = 0, t2 = this.byteLength) {
+ let i3 = this.getUint8Array(e3, t2);
+ return C(i3);
}
- function filterSequences(sequences) {
- const showsPano = context.photos().showsPanoramic();
- const showsFlat = context.photos().showsFlat();
- const fromDate = context.photos().fromDate();
- const toDate = context.photos().toDate();
- if (!showsPano || !showsFlat) {
- sequences = sequences.filter(function(sequence) {
- if (sequence.properties.hasOwnProperty("is_pano")) {
- if (sequence.properties.is_pano)
- return showsPano;
- return showsFlat;
- }
- return false;
- });
- }
- if (fromDate) {
- sequences = sequences.filter(function(sequence) {
- return new Date(sequence.properties.captured_at).getTime() >= new Date(fromDate).getTime().toString();
- });
- }
- if (toDate) {
- sequences = sequences.filter(function(sequence) {
- return new Date(sequence.properties.captured_at).getTime() <= new Date(toDate).getTime().toString();
- });
- }
- return sequences;
+ getUnicodeString(e3 = 0, t2 = this.byteLength) {
+ const i3 = [];
+ for (let n3 = 0; n3 < t2 && e3 + n3 < this.byteLength; n3 += 2) i3.push(this.getUint16(e3 + n3));
+ return C(i3);
}
- function update() {
- const z = ~~context.map().zoom();
- const showMarkers = z >= minMarkerZoom;
- const showViewfields = z >= minViewfieldZoom;
- const service = getService();
- let sequences = service ? service.sequences(projection2) : [];
- let images = service && showMarkers ? service.images(projection2) : [];
- images = filterImages(images);
- sequences = filterSequences(sequences, service);
- service.filterViewer(context);
- let traces = layer.selectAll(".sequences").selectAll(".sequence").data(sequences, function(d) {
- return d.properties.id;
- });
- traces.exit().remove();
- traces = traces.enter().append("path").attr("class", "sequence").merge(traces).attr("d", svgPath(projection2).geojson);
- const groups = layer.selectAll(".markers").selectAll(".viewfield-group").data(images, function(d) {
- return d.id;
- });
- groups.exit().remove();
- const groupsEnter = groups.enter().append("g").attr("class", "viewfield-group").on("mouseenter", mouseover).on("mouseleave", mouseout).on("click", click);
- groupsEnter.append("g").attr("class", "viewfield-scale");
- const markers = groups.merge(groupsEnter).sort(function(a, b) {
- return b.loc[1] - a.loc[1];
- }).attr("transform", transform2).select(".viewfield-scale");
- markers.selectAll("circle").data([0]).enter().append("circle").attr("dx", "0").attr("dy", "0").attr("r", "6");
- const viewfields = markers.selectAll(".viewfield").data(showViewfields ? [0] : []);
- viewfields.exit().remove();
- viewfields.enter().insert("path", "circle").attr("class", "viewfield").classed("pano", function() {
- return this.parentNode.__data__.is_pano;
- }).attr("transform", "scale(1.5,1.5),translate(-8, -13)").attr("d", viewfieldPath);
- function viewfieldPath() {
- if (this.parentNode.__data__.is_pano) {
- return "M 8,13 m -10,0 a 10,10 0 1,0 20,0 a 10,10 0 1,0 -20,0";
- } else {
- return "M 6,9 C 8,8.4 8,8.4 10,9 L 16,-2 C 12,-5 4,-5 0,-2 z";
- }
- }
+ getInt8(e3) {
+ return this.dataView.getInt8(e3);
}
- function drawImages(selection2) {
- const enabled = svgMapillaryImages.enabled;
- const service = getService();
- layer = selection2.selectAll(".layer-mapillary").data(service ? [0] : []);
- layer.exit().remove();
- const layerEnter = layer.enter().append("g").attr("class", "layer-mapillary").style("display", enabled ? "block" : "none");
- layerEnter.append("g").attr("class", "sequences");
- layerEnter.append("g").attr("class", "markers");
- layer = layerEnter.merge(layer);
- if (enabled) {
- if (service && ~~context.map().zoom() >= minZoom3) {
- editOn();
- update();
- service.loadImages(projection2);
- } else {
- editOff();
- }
+ getUint8(e3) {
+ return this.dataView.getUint8(e3);
+ }
+ getInt16(e3, t2 = this.le) {
+ return this.dataView.getInt16(e3, t2);
+ }
+ getInt32(e3, t2 = this.le) {
+ return this.dataView.getInt32(e3, t2);
+ }
+ getUint16(e3, t2 = this.le) {
+ return this.dataView.getUint16(e3, t2);
+ }
+ getUint32(e3, t2 = this.le) {
+ return this.dataView.getUint32(e3, t2);
+ }
+ getFloat32(e3, t2 = this.le) {
+ return this.dataView.getFloat32(e3, t2);
+ }
+ getFloat64(e3, t2 = this.le) {
+ return this.dataView.getFloat64(e3, t2);
+ }
+ getFloat(e3, t2 = this.le) {
+ return this.dataView.getFloat32(e3, t2);
+ }
+ getDouble(e3, t2 = this.le) {
+ return this.dataView.getFloat64(e3, t2);
+ }
+ getUintBytes(e3, t2, i3) {
+ switch (t2) {
+ case 1:
+ return this.getUint8(e3, i3);
+ case 2:
+ return this.getUint16(e3, i3);
+ case 4:
+ return this.getUint32(e3, i3);
+ case 8:
+ return this.getUint64 && this.getUint64(e3, i3);
}
}
- drawImages.enabled = function(_) {
- if (!arguments.length)
- return svgMapillaryImages.enabled;
- svgMapillaryImages.enabled = _;
- if (svgMapillaryImages.enabled) {
- showLayer();
- context.photos().on("change.mapillary_images", update);
- } else {
- hideLayer();
- context.photos().on("change.mapillary_images", null);
+ getUint(e3, t2, i3) {
+ switch (t2) {
+ case 8:
+ return this.getUint8(e3, i3);
+ case 16:
+ return this.getUint16(e3, i3);
+ case 32:
+ return this.getUint32(e3, i3);
+ case 64:
+ return this.getUint64 && this.getUint64(e3, i3);
}
- dispatch10.call("change");
- return this;
- };
- drawImages.supported = function() {
- return !!getService();
- };
- init2();
- return drawImages;
+ }
+ toString(e3) {
+ return this.dataView.toString(e3, this.constructor.name);
+ }
+ ensureChunk() {
+ }
+ };
+ function P(e3, t2) {
+ g2("".concat(e3, " '").concat(t2, "' was not loaded, try using full build of exifr."));
}
-
- // modules/svg/mapillary_position.js
- function svgMapillaryPosition(projection2, context) {
- const throttledRedraw = throttle_default(function() {
- update();
- }, 1e3);
- const minZoom3 = 12;
- const minViewfieldZoom = 18;
- let layer = select_default2(null);
- let _mapillary;
- let viewerCompassAngle;
- function init2() {
- if (svgMapillaryPosition.initialized)
- return;
- svgMapillaryPosition.initialized = true;
+ var k = class extends Map {
+ constructor(e3) {
+ super(), this.kind = e3;
}
- function getService() {
- if (services.mapillary && !_mapillary) {
- _mapillary = services.mapillary;
- _mapillary.event.on("imageChanged", throttledRedraw);
- _mapillary.event.on("bearingChanged", function(e) {
- viewerCompassAngle = e.bearing;
- if (context.map().isTransformed())
- return;
- layer.selectAll(".viewfield-group.currentView").filter(function(d) {
- return d.is_pano;
- }).attr("transform", transform2);
- });
- } else if (!services.mapillary && _mapillary) {
- _mapillary = null;
- }
- return _mapillary;
+ get(e3, t2) {
+ return this.has(e3) || P(this.kind, e3), t2 && (e3 in t2 || function(e4, t3) {
+ g2("Unknown ".concat(e4, " '").concat(t3, "'."));
+ }(this.kind, e3), t2[e3].enabled || P(this.kind, e3)), super.get(e3);
}
- function editOn() {
- layer.style("display", "block");
+ keyList() {
+ return Array.from(this.keys());
}
- function editOff() {
- layer.selectAll(".viewfield-group").remove();
- layer.style("display", "none");
+ };
+ var w = new k("file parser");
+ var T = new k("segment parser");
+ var A = new k("file reader");
+ function D(e3, n3) {
+ return "string" == typeof e3 ? O(e3, n3) : t && !i2 && e3 instanceof HTMLImageElement ? O(e3.src, n3) : e3 instanceof Uint8Array || e3 instanceof ArrayBuffer || e3 instanceof DataView ? new I(e3) : t && e3 instanceof Blob ? x(e3, n3, "blob", R) : void g2("Invalid input argument");
+ }
+ function O(e3, i3) {
+ return (s2 = e3).startsWith("data:") || s2.length > 1e4 ? v(e3, i3, "base64") : n2 && e3.includes("://") ? x(e3, i3, "url", M) : n2 ? v(e3, i3, "fs") : t ? x(e3, i3, "url", M) : void g2("Invalid input argument");
+ var s2;
+ }
+ async function x(e3, t2, i3, n3) {
+ return A.has(i3) ? v(e3, t2, i3) : n3 ? async function(e4, t3) {
+ let i4 = await t3(e4);
+ return new I(i4);
+ }(e3, n3) : void g2("Parser ".concat(i3, " is not loaded"));
+ }
+ async function v(e3, t2, i3) {
+ let n3 = new (A.get(i3))(e3, t2);
+ return await n3.read(), n3;
+ }
+ var M = (e3) => h(e3).then((e4) => e4.arrayBuffer());
+ var R = (e3) => new Promise((t2, i3) => {
+ let n3 = new FileReader();
+ n3.onloadend = () => t2(n3.result || new ArrayBuffer()), n3.onerror = i3, n3.readAsArrayBuffer(e3);
+ });
+ var L = class extends Map {
+ get tagKeys() {
+ return this.allKeys || (this.allKeys = Array.from(this.keys())), this.allKeys;
}
- function transform2(d) {
- let t = svgPointTransform(projection2)(d);
- if (d.is_pano && viewerCompassAngle !== null && isFinite(viewerCompassAngle)) {
- t += " rotate(" + Math.floor(viewerCompassAngle) + ",0,0)";
- } else if (d.ca) {
- t += " rotate(" + Math.floor(d.ca) + ",0,0)";
- }
- return t;
+ get tagValues() {
+ return this.allValues || (this.allValues = Array.from(this.values())), this.allValues;
}
- function update() {
- const z = ~~context.map().zoom();
- const showViewfields = z >= minViewfieldZoom;
- const service = getService();
- const image = service && service.getActiveImage();
- const groups = layer.selectAll(".markers").selectAll(".viewfield-group").data(image ? [image] : [], function(d) {
- return d.id;
- });
- groups.exit().remove();
- const groupsEnter = groups.enter().append("g").attr("class", "viewfield-group currentView highlighted");
- groupsEnter.append("g").attr("class", "viewfield-scale");
- const markers = groups.merge(groupsEnter).attr("transform", transform2).select(".viewfield-scale");
- markers.selectAll("circle").data([0]).enter().append("circle").attr("dx", "0").attr("dy", "0").attr("r", "6");
- const viewfields = markers.selectAll(".viewfield").data(showViewfields ? [0] : []);
- viewfields.exit().remove();
- viewfields.enter().insert("path", "circle").attr("class", "viewfield").attr("transform", "scale(1.5,1.5),translate(-8, -13)").attr("d", "M 6,9 C 8,8.4 8,8.4 10,9 L 16,-2 C 12,-5 4,-5 0,-2 z");
+ };
+ function U(e3, t2, i3) {
+ let n3 = new L();
+ for (let [e4, t3] of i3) n3.set(e4, t3);
+ if (Array.isArray(t2)) for (let i4 of t2) e3.set(i4, n3);
+ else e3.set(t2, n3);
+ return n3;
+ }
+ function F(e3, t2, i3) {
+ let n3, s2 = e3.get(t2);
+ for (n3 of i3) s2.set(n3[0], n3[1]);
+ }
+ var E = /* @__PURE__ */ new Map();
+ var B = /* @__PURE__ */ new Map();
+ var N = /* @__PURE__ */ new Map();
+ var G = ["chunked", "firstChunkSize", "firstChunkSizeNode", "firstChunkSizeBrowser", "chunkSize", "chunkLimit"];
+ var V = ["jfif", "xmp", "icc", "iptc", "ihdr"];
+ var z = ["tiff", ...V];
+ var H = ["ifd0", "ifd1", "exif", "gps", "interop"];
+ var j = [...z, ...H];
+ var W = ["makerNote", "userComment"];
+ var K = ["translateKeys", "translateValues", "reviveValues", "multiSegment"];
+ var X = [...K, "sanitize", "mergeOutput", "silentErrors"];
+ var _ = class {
+ get translate() {
+ return this.translateKeys || this.translateValues || this.reviveValues;
}
- function drawImages(selection2) {
- const service = getService();
- layer = selection2.selectAll(".layer-mapillary-position").data(service ? [0] : []);
- layer.exit().remove();
- const layerEnter = layer.enter().append("g").attr("class", "layer-mapillary-position");
- layerEnter.append("g").attr("class", "markers");
- layer = layerEnter.merge(layer);
- if (service && ~~context.map().zoom() >= minZoom3) {
- editOn();
- update();
- } else {
- editOff();
- }
+ };
+ var Y = class extends _ {
+ get needed() {
+ return this.enabled || this.deps.size > 0;
}
- drawImages.enabled = function() {
- update();
- return this;
- };
- drawImages.supported = function() {
- return !!getService();
- };
- init2();
- return drawImages;
- }
-
- // modules/svg/mapillary_signs.js
- function svgMapillarySigns(projection2, context, dispatch10) {
- const throttledRedraw = throttle_default(function() {
- dispatch10.call("change");
- }, 1e3);
- const minZoom3 = 12;
- let layer = select_default2(null);
- let _mapillary;
- function init2() {
- if (svgMapillarySigns.initialized)
- return;
- svgMapillarySigns.enabled = false;
- svgMapillarySigns.initialized = true;
+ constructor(e3, t2, i3, n3) {
+ if (super(), c(this, "enabled", false), c(this, "skip", /* @__PURE__ */ new Set()), c(this, "pick", /* @__PURE__ */ new Set()), c(this, "deps", /* @__PURE__ */ new Set()), c(this, "translateKeys", false), c(this, "translateValues", false), c(this, "reviveValues", false), this.key = e3, this.enabled = t2, this.parse = this.enabled, this.applyInheritables(n3), this.canBeFiltered = H.includes(e3), this.canBeFiltered && (this.dict = E.get(e3)), void 0 !== i3) if (Array.isArray(i3)) this.parse = this.enabled = true, this.canBeFiltered && i3.length > 0 && this.translateTagSet(i3, this.pick);
+ else if ("object" == typeof i3) {
+ if (this.enabled = true, this.parse = false !== i3.parse, this.canBeFiltered) {
+ let { pick: e4, skip: t3 } = i3;
+ e4 && e4.length > 0 && this.translateTagSet(e4, this.pick), t3 && t3.length > 0 && this.translateTagSet(t3, this.skip);
+ }
+ this.applyInheritables(i3);
+ } else true === i3 || false === i3 ? this.parse = this.enabled = i3 : g2("Invalid options argument: ".concat(i3));
}
- function getService() {
- if (services.mapillary && !_mapillary) {
- _mapillary = services.mapillary;
- _mapillary.event.on("loadedSigns", throttledRedraw);
- } else if (!services.mapillary && _mapillary) {
- _mapillary = null;
- }
- return _mapillary;
+ applyInheritables(e3) {
+ let t2, i3;
+ for (t2 of K) i3 = e3[t2], void 0 !== i3 && (this[t2] = i3);
}
- function showLayer() {
- const service = getService();
- if (!service)
- return;
- service.loadSignResources(context);
- editOn();
+ translateTagSet(e3, t2) {
+ if (this.dict) {
+ let i3, n3, { tagKeys: s2, tagValues: r2 } = this.dict;
+ for (i3 of e3) "string" == typeof i3 ? (n3 = r2.indexOf(i3), -1 === n3 && (n3 = s2.indexOf(Number(i3))), -1 !== n3 && t2.add(Number(s2[n3]))) : t2.add(i3);
+ } else for (let i3 of e3) t2.add(i3);
}
- function hideLayer() {
- throttledRedraw.cancel();
- editOff();
+ finalizeFilters() {
+ !this.enabled && this.deps.size > 0 ? (this.enabled = true, ee(this.pick, this.deps)) : this.enabled && this.pick.size > 0 && ee(this.pick, this.deps);
}
- function editOn() {
- layer.style("display", "block");
+ };
+ var $2 = { jfif: false, tiff: true, xmp: false, icc: false, iptc: false, ifd0: true, ifd1: false, exif: true, gps: true, interop: false, ihdr: void 0, makerNote: false, userComment: false, multiSegment: false, skip: [], pick: [], translateKeys: true, translateValues: true, reviveValues: true, sanitize: true, mergeOutput: true, silentErrors: true, chunked: true, firstChunkSize: void 0, firstChunkSizeNode: 512, firstChunkSizeBrowser: 65536, chunkSize: 65536, chunkLimit: 5 };
+ var J = /* @__PURE__ */ new Map();
+ var q = class extends _ {
+ static useCached(e3) {
+ let t2 = J.get(e3);
+ return void 0 !== t2 || (t2 = new this(e3), J.set(e3, t2)), t2;
+ }
+ constructor(e3) {
+ super(), true === e3 ? this.setupFromTrue() : void 0 === e3 ? this.setupFromUndefined() : Array.isArray(e3) ? this.setupFromArray(e3) : "object" == typeof e3 ? this.setupFromObject(e3) : g2("Invalid options argument ".concat(e3)), void 0 === this.firstChunkSize && (this.firstChunkSize = t ? this.firstChunkSizeBrowser : this.firstChunkSizeNode), this.mergeOutput && (this.ifd1.enabled = false), this.filterNestedSegmentTags(), this.traverseTiffDependencyTree(), this.checkLoadedPlugins();
+ }
+ setupFromUndefined() {
+ let e3;
+ for (e3 of G) this[e3] = $2[e3];
+ for (e3 of X) this[e3] = $2[e3];
+ for (e3 of W) this[e3] = $2[e3];
+ for (e3 of j) this[e3] = new Y(e3, $2[e3], void 0, this);
+ }
+ setupFromTrue() {
+ let e3;
+ for (e3 of G) this[e3] = $2[e3];
+ for (e3 of X) this[e3] = $2[e3];
+ for (e3 of W) this[e3] = true;
+ for (e3 of j) this[e3] = new Y(e3, true, void 0, this);
+ }
+ setupFromArray(e3) {
+ let t2;
+ for (t2 of G) this[t2] = $2[t2];
+ for (t2 of X) this[t2] = $2[t2];
+ for (t2 of W) this[t2] = $2[t2];
+ for (t2 of j) this[t2] = new Y(t2, false, void 0, this);
+ this.setupGlobalFilters(e3, void 0, H);
+ }
+ setupFromObject(e3) {
+ let t2;
+ for (t2 of (H.ifd0 = H.ifd0 || H.image, H.ifd1 = H.ifd1 || H.thumbnail, Object.assign(this, e3), G)) this[t2] = Z(e3[t2], $2[t2]);
+ for (t2 of X) this[t2] = Z(e3[t2], $2[t2]);
+ for (t2 of W) this[t2] = Z(e3[t2], $2[t2]);
+ for (t2 of z) this[t2] = new Y(t2, $2[t2], e3[t2], this);
+ for (t2 of H) this[t2] = new Y(t2, $2[t2], e3[t2], this.tiff);
+ this.setupGlobalFilters(e3.pick, e3.skip, H, j), true === e3.tiff ? this.batchEnableWithBool(H, true) : false === e3.tiff ? this.batchEnableWithUserValue(H, e3) : Array.isArray(e3.tiff) ? this.setupGlobalFilters(e3.tiff, void 0, H) : "object" == typeof e3.tiff && this.setupGlobalFilters(e3.tiff.pick, e3.tiff.skip, H);
+ }
+ batchEnableWithBool(e3, t2) {
+ for (let i3 of e3) this[i3].enabled = t2;
+ }
+ batchEnableWithUserValue(e3, t2) {
+ for (let i3 of e3) {
+ let e4 = t2[i3];
+ this[i3].enabled = false !== e4 && void 0 !== e4;
+ }
+ }
+ setupGlobalFilters(e3, t2, i3, n3 = i3) {
+ if (e3 && e3.length) {
+ for (let e4 of n3) this[e4].enabled = false;
+ let t3 = Q(e3, i3);
+ for (let [e4, i4] of t3) ee(this[e4].pick, i4), this[e4].enabled = true;
+ } else if (t2 && t2.length) {
+ let e4 = Q(t2, i3);
+ for (let [t3, i4] of e4) ee(this[t3].skip, i4);
+ }
+ }
+ filterNestedSegmentTags() {
+ let { ifd0: e3, exif: t2, xmp: i3, iptc: n3, icc: s2 } = this;
+ this.makerNote ? t2.deps.add(37500) : t2.skip.add(37500), this.userComment ? t2.deps.add(37510) : t2.skip.add(37510), i3.enabled || e3.skip.add(700), n3.enabled || e3.skip.add(33723), s2.enabled || e3.skip.add(34675);
+ }
+ traverseTiffDependencyTree() {
+ let { ifd0: e3, exif: t2, gps: i3, interop: n3 } = this;
+ n3.needed && (t2.deps.add(40965), e3.deps.add(40965)), t2.needed && e3.deps.add(34665), i3.needed && e3.deps.add(34853), this.tiff.enabled = H.some((e4) => true === this[e4].enabled) || this.makerNote || this.userComment;
+ for (let e4 of H) this[e4].finalizeFilters();
+ }
+ get onlyTiff() {
+ return !V.map((e3) => this[e3].enabled).some((e3) => true === e3) && this.tiff.enabled;
+ }
+ checkLoadedPlugins() {
+ for (let e3 of z) this[e3].enabled && !T.has(e3) && P("segment parser", e3);
}
- function editOff() {
- layer.selectAll(".icon-sign").remove();
- layer.style("display", "none");
+ };
+ function Q(e3, t2) {
+ let i3, n3, s2, r2, a2 = [];
+ for (s2 of t2) {
+ for (r2 of (i3 = E.get(s2), n3 = [], i3)) (e3.includes(r2[0]) || e3.includes(r2[1])) && n3.push(r2[0]);
+ n3.length && a2.push([s2, n3]);
+ }
+ return a2;
+ }
+ function Z(e3, t2) {
+ return void 0 !== e3 ? e3 : void 0 !== t2 ? t2 : void 0;
+ }
+ function ee(e3, t2) {
+ for (let i3 of t2) e3.add(i3);
+ }
+ c(q, "default", $2);
+ var te = class {
+ constructor(e3) {
+ c(this, "parsers", {}), c(this, "output", {}), c(this, "errors", []), c(this, "pushToErrors", (e4) => this.errors.push(e4)), this.options = q.useCached(e3);
+ }
+ async read(e3) {
+ this.file = await D(e3, this.options);
+ }
+ setup() {
+ if (this.fileParser) return;
+ let { file: e3 } = this, t2 = e3.getUint16(0);
+ for (let [i3, n3] of w) if (n3.canHandle(e3, t2)) return this.fileParser = new n3(this.options, this.file, this.parsers), e3[i3] = true;
+ this.file.close && this.file.close(), g2("Unknown file format");
+ }
+ async parse() {
+ let { output: e3, errors: t2 } = this;
+ return this.setup(), this.options.silentErrors ? (await this.executeParsers().catch(this.pushToErrors), t2.push(...this.fileParser.errors)) : await this.executeParsers(), this.file.close && this.file.close(), this.options.silentErrors && t2.length > 0 && (e3.errors = t2), f(e3);
+ }
+ async executeParsers() {
+ let { output: e3 } = this;
+ await this.fileParser.parse();
+ let t2 = Object.values(this.parsers).map(async (t3) => {
+ let i3 = await t3.parse();
+ t3.assignToOutput(e3, i3);
+ });
+ this.options.silentErrors && (t2 = t2.map((e4) => e4.catch(this.pushToErrors))), await Promise.all(t2);
+ }
+ async extractThumbnail() {
+ this.setup();
+ let { options: e3, file: t2 } = this, i3 = T.get("tiff", e3);
+ var n3;
+ if (t2.tiff ? n3 = { start: 0, type: "tiff" } : t2.jpeg && (n3 = await this.fileParser.getOrFindSegment("tiff")), void 0 === n3) return;
+ let s2 = await this.fileParser.ensureSegmentChunk(n3), r2 = this.parsers.tiff = new i3(s2, e3, t2), a2 = await r2.extractThumbnail();
+ return t2.close && t2.close(), a2;
}
- function click(d3_event, d) {
- const service = getService();
- if (!service)
- return;
- context.map().centerEase(d.loc);
- const selectedImageId = service.getActiveImage() && service.getActiveImage().id;
- service.getDetections(d.id).then((detections) => {
- if (detections.length) {
- const imageId = detections[0].image.id;
- if (imageId === selectedImageId) {
- service.highlightDetection(detections[0]).selectImage(context, imageId);
- } else {
- service.ensureViewerLoaded(context).then(function() {
- service.highlightDetection(detections[0]).selectImage(context, imageId).showViewer(context);
- });
- }
+ };
+ async function ie(e3, t2) {
+ let i3 = new te(t2);
+ return await i3.read(e3), i3.parse();
+ }
+ var ne = Object.freeze({ __proto__: null, parse: ie, Exifr: te, fileParsers: w, segmentParsers: T, fileReaders: A, tagKeys: E, tagValues: B, tagRevivers: N, createDictionary: U, extendDictionary: F, fetchUrlAsArrayBuffer: M, readBlobAsArrayBuffer: R, chunkedProps: G, otherSegments: V, segments: z, tiffBlocks: H, segmentsAndBlocks: j, tiffExtractables: W, inheritables: K, allFormatters: X, Options: q });
+ var se = class {
+ constructor(e3, t2, i3) {
+ c(this, "errors", []), c(this, "ensureSegmentChunk", async (e4) => {
+ let t3 = e4.start, i4 = e4.size || 65536;
+ if (this.file.chunked) if (this.file.available(t3, i4)) e4.chunk = this.file.subarray(t3, i4);
+ else try {
+ e4.chunk = await this.file.readChunk(t3, i4);
+ } catch (t4) {
+ g2("Couldn't read segment: ".concat(JSON.stringify(e4), ". ").concat(t4.message));
}
- });
+ else this.file.byteLength > t3 + i4 ? e4.chunk = this.file.subarray(t3, i4) : void 0 === e4.size ? e4.chunk = this.file.subarray(t3) : g2("Segment unreachable: " + JSON.stringify(e4));
+ return e4.chunk;
+ }), this.extendOptions && this.extendOptions(e3), this.options = e3, this.file = t2, this.parsers = i3;
}
- function filterData(detectedFeatures) {
- var fromDate = context.photos().fromDate();
- var toDate = context.photos().toDate();
- if (fromDate) {
- var fromTimestamp = new Date(fromDate).getTime();
- detectedFeatures = detectedFeatures.filter(function(feature3) {
- return new Date(feature3.last_seen_at).getTime() >= fromTimestamp;
- });
- }
- if (toDate) {
- var toTimestamp = new Date(toDate).getTime();
- detectedFeatures = detectedFeatures.filter(function(feature3) {
- return new Date(feature3.first_seen_at).getTime() <= toTimestamp;
- });
- }
- return detectedFeatures;
+ injectSegment(e3, t2) {
+ this.options[e3].enabled && this.createParser(e3, t2);
}
- function update() {
- const service = getService();
- let data = service ? service.signs(projection2) : [];
- data = filterData(data);
- const transform2 = svgPointTransform(projection2);
- const signs = layer.selectAll(".icon-sign").data(data, function(d) {
- return d.id;
- });
- signs.exit().remove();
- const enter = signs.enter().append("g").attr("class", "icon-sign icon-detected").on("click", click);
- enter.append("use").attr("width", "24px").attr("height", "24px").attr("x", "-12px").attr("y", "-12px").attr("xlink:href", function(d) {
- return "#" + d.value;
- });
- enter.append("rect").attr("width", "24px").attr("height", "24px").attr("x", "-12px").attr("y", "-12px");
- signs.merge(enter).attr("transform", transform2);
+ createParser(e3, t2) {
+ let i3 = new (T.get(e3))(t2, this.options, this.file);
+ return this.parsers[e3] = i3;
}
- function drawSigns(selection2) {
- const enabled = svgMapillarySigns.enabled;
- const service = getService();
- layer = selection2.selectAll(".layer-mapillary-signs").data(service ? [0] : []);
- layer.exit().remove();
- layer = layer.enter().append("g").attr("class", "layer-mapillary-signs layer-mapillary-detections").style("display", enabled ? "block" : "none").merge(layer);
- if (enabled) {
- if (service && ~~context.map().zoom() >= minZoom3) {
- editOn();
- update();
- service.loadSigns(projection2);
- service.showSignDetections(true);
- } else {
- editOff();
+ createParsers(e3) {
+ for (let t2 of e3) {
+ let { type: e4, chunk: i3 } = t2, n3 = this.options[e4];
+ if (n3 && n3.enabled) {
+ let t3 = this.parsers[e4];
+ t3 && t3.append || t3 || this.createParser(e4, i3);
}
- } else if (service) {
- service.showSignDetections(false);
}
}
- drawSigns.enabled = function(_) {
- if (!arguments.length)
- return svgMapillarySigns.enabled;
- svgMapillarySigns.enabled = _;
- if (svgMapillarySigns.enabled) {
- showLayer();
- context.photos().on("change.mapillary_signs", update);
- } else {
- hideLayer();
- context.photos().on("change.mapillary_signs", null);
- }
- dispatch10.call("change");
- return this;
- };
- drawSigns.supported = function() {
- return !!getService();
- };
- init2();
- return drawSigns;
- }
-
- // modules/svg/mapillary_map_features.js
- function svgMapillaryMapFeatures(projection2, context, dispatch10) {
- const throttledRedraw = throttle_default(function() {
- dispatch10.call("change");
- }, 1e3);
- const minZoom3 = 12;
- let layer = select_default2(null);
- let _mapillary;
- function init2() {
- if (svgMapillaryMapFeatures.initialized)
- return;
- svgMapillaryMapFeatures.enabled = false;
- svgMapillaryMapFeatures.initialized = true;
+ async readSegments(e3) {
+ let t2 = e3.map(this.ensureSegmentChunk);
+ await Promise.all(t2);
}
- function getService() {
- if (services.mapillary && !_mapillary) {
- _mapillary = services.mapillary;
- _mapillary.event.on("loadedMapFeatures", throttledRedraw);
- } else if (!services.mapillary && _mapillary) {
- _mapillary = null;
- }
- return _mapillary;
+ };
+ var re2 = class {
+ static findPosition(e3, t2) {
+ let i3 = e3.getUint16(t2 + 2) + 2, n3 = "function" == typeof this.headerLength ? this.headerLength(e3, t2, i3) : this.headerLength, s2 = t2 + n3, r2 = i3 - n3;
+ return { offset: t2, length: i3, headerLength: n3, start: s2, size: r2, end: s2 + r2 };
}
- function showLayer() {
- const service = getService();
- if (!service)
- return;
- service.loadObjectResources(context);
- editOn();
+ static parse(e3, t2 = {}) {
+ return new this(e3, new q({ [this.type]: t2 }), e3).parse();
}
- function hideLayer() {
- throttledRedraw.cancel();
- editOff();
+ normalizeInput(e3) {
+ return e3 instanceof I ? e3 : new I(e3);
}
- function editOn() {
- layer.style("display", "block");
+ constructor(e3, t2 = {}, i3) {
+ c(this, "errors", []), c(this, "raw", /* @__PURE__ */ new Map()), c(this, "handleError", (e4) => {
+ if (!this.options.silentErrors) throw e4;
+ this.errors.push(e4.message);
+ }), this.chunk = this.normalizeInput(e3), this.file = i3, this.type = this.constructor.type, this.globalOptions = this.options = t2, this.localOptions = t2[this.type], this.canTranslate = this.localOptions && this.localOptions.translate;
}
- function editOff() {
- layer.selectAll(".icon-map-feature").remove();
- layer.style("display", "none");
+ translate() {
+ this.canTranslate && (this.translated = this.translateBlock(this.raw, this.type));
}
- function click(d3_event, d) {
- const service = getService();
- if (!service)
- return;
- context.map().centerEase(d.loc);
- const selectedImageId = service.getActiveImage() && service.getActiveImage().id;
- service.getDetections(d.id).then((detections) => {
- if (detections.length) {
- const imageId = detections[0].image.id;
- if (imageId === selectedImageId) {
- service.highlightDetection(detections[0]).selectImage(context, imageId);
- } else {
- service.ensureViewerLoaded(context).then(function() {
- service.highlightDetection(detections[0]).selectImage(context, imageId).showViewer(context);
- });
- }
- }
- });
+ get output() {
+ return this.translated ? this.translated : this.raw ? Object.fromEntries(this.raw) : void 0;
}
- function filterData(detectedFeatures) {
- const fromDate = context.photos().fromDate();
- const toDate = context.photos().toDate();
- if (fromDate) {
- detectedFeatures = detectedFeatures.filter(function(feature3) {
- return new Date(feature3.last_seen_at).getTime() >= new Date(fromDate).getTime();
- });
+ translateBlock(e3, t2) {
+ let i3 = N.get(t2), n3 = B.get(t2), s2 = E.get(t2), r2 = this.options[t2], a2 = r2.reviveValues && !!i3, o2 = r2.translateValues && !!n3, l2 = r2.translateKeys && !!s2, h2 = {};
+ for (let [t3, r3] of e3) a2 && i3.has(t3) ? r3 = i3.get(t3)(r3) : o2 && n3.has(t3) && (r3 = this.translateValue(r3, n3.get(t3))), l2 && s2.has(t3) && (t3 = s2.get(t3) || t3), h2[t3] = r3;
+ return h2;
+ }
+ translateValue(e3, t2) {
+ return t2[e3] || t2.DEFAULT || e3;
+ }
+ assignToOutput(e3, t2) {
+ this.assignObjectToOutput(e3, this.constructor.type, t2);
+ }
+ assignObjectToOutput(e3, t2, i3) {
+ if (this.globalOptions.mergeOutput) return Object.assign(e3, i3);
+ e3[t2] ? Object.assign(e3[t2], i3) : e3[t2] = i3;
+ }
+ };
+ c(re2, "headerLength", 4), c(re2, "type", void 0), c(re2, "multiSegment", false), c(re2, "canHandle", () => false);
+ function ae(e3) {
+ return 192 === e3 || 194 === e3 || 196 === e3 || 219 === e3 || 221 === e3 || 218 === e3 || 254 === e3;
+ }
+ function oe(e3) {
+ return e3 >= 224 && e3 <= 239;
+ }
+ function le(e3, t2, i3) {
+ for (let [n3, s2] of T) if (s2.canHandle(e3, t2, i3)) return n3;
+ }
+ var he = class extends se {
+ constructor(...e3) {
+ super(...e3), c(this, "appSegments", []), c(this, "jpegSegments", []), c(this, "unknownSegments", []);
+ }
+ static canHandle(e3, t2) {
+ return 65496 === t2;
+ }
+ async parse() {
+ await this.findAppSegments(), await this.readSegments(this.appSegments), this.mergeMultiSegments(), this.createParsers(this.mergedAppSegments || this.appSegments);
+ }
+ setupSegmentFinderArgs(e3) {
+ true === e3 ? (this.findAll = true, this.wanted = new Set(T.keyList())) : (e3 = void 0 === e3 ? T.keyList().filter((e4) => this.options[e4].enabled) : e3.filter((e4) => this.options[e4].enabled && T.has(e4)), this.findAll = false, this.remaining = new Set(e3), this.wanted = new Set(e3)), this.unfinishedMultiSegment = false;
+ }
+ async findAppSegments(e3 = 0, t2) {
+ this.setupSegmentFinderArgs(t2);
+ let { file: i3, findAll: n3, wanted: s2, remaining: r2 } = this;
+ if (!n3 && this.file.chunked && (n3 = Array.from(s2).some((e4) => {
+ let t3 = T.get(e4), i4 = this.options[e4];
+ return t3.multiSegment && i4.multiSegment;
+ }), n3 && await this.file.readWhole()), e3 = this.findAppSegmentsInRange(e3, i3.byteLength), !this.options.onlyTiff && i3.chunked) {
+ let t3 = false;
+ for (; r2.size > 0 && !t3 && (i3.canReadNextChunk || this.unfinishedMultiSegment); ) {
+ let { nextChunkOffset: n4 } = i3, s3 = this.appSegments.some((e4) => !this.file.available(e4.offset || e4.start, e4.length || e4.size));
+ if (t3 = e3 > n4 && !s3 ? !await i3.readNextChunk(e3) : !await i3.readNextChunk(n4), void 0 === (e3 = this.findAppSegmentsInRange(e3, i3.byteLength))) return;
+ }
}
- if (toDate) {
- detectedFeatures = detectedFeatures.filter(function(feature3) {
- return new Date(feature3.first_seen_at).getTime() <= new Date(toDate).getTime();
- });
+ }
+ findAppSegmentsInRange(e3, t2) {
+ t2 -= 2;
+ let i3, n3, s2, r2, a2, o2, { file: l2, findAll: h2, wanted: u2, remaining: c2, options: f2 } = this;
+ for (; e3 < t2; e3++) if (255 === l2.getUint8(e3)) {
+ if (i3 = l2.getUint8(e3 + 1), oe(i3)) {
+ if (n3 = l2.getUint16(e3 + 2), s2 = le(l2, e3, n3), s2 && u2.has(s2) && (r2 = T.get(s2), a2 = r2.findPosition(l2, e3), o2 = f2[s2], a2.type = s2, this.appSegments.push(a2), !h2 && (r2.multiSegment && o2.multiSegment ? (this.unfinishedMultiSegment = a2.chunkNumber < a2.chunkCount, this.unfinishedMultiSegment || c2.delete(s2)) : c2.delete(s2), 0 === c2.size))) break;
+ f2.recordUnknownSegments && (a2 = re2.findPosition(l2, e3), a2.marker = i3, this.unknownSegments.push(a2)), e3 += n3 + 1;
+ } else if (ae(i3)) {
+ if (n3 = l2.getUint16(e3 + 2), 218 === i3 && false !== f2.stopAfterSos) return;
+ f2.recordJpegSegments && this.jpegSegments.push({ offset: e3, length: n3, marker: i3 }), e3 += n3 + 1;
+ }
}
- return detectedFeatures;
+ return e3;
}
- function update() {
- const service = getService();
- let data = service ? service.mapFeatures(projection2) : [];
- data = filterData(data);
- const transform2 = svgPointTransform(projection2);
- const mapFeatures = layer.selectAll(".icon-map-feature").data(data, function(d) {
- return d.id;
- });
- mapFeatures.exit().remove();
- const enter = mapFeatures.enter().append("g").attr("class", "icon-map-feature icon-detected").on("click", click);
- enter.append("title").text(function(d) {
- var id2 = d.value.replace(/--/g, ".").replace(/-/g, "_");
- return _t("mapillary_map_features." + id2);
- });
- enter.append("use").attr("width", "24px").attr("height", "24px").attr("x", "-12px").attr("y", "-12px").attr("xlink:href", function(d) {
- if (d.value === "object--billboard") {
- return "#object--sign--advertisement";
+ mergeMultiSegments() {
+ if (!this.appSegments.some((e4) => e4.multiSegment)) return;
+ let e3 = function(e4, t2) {
+ let i3, n3, s2, r2 = /* @__PURE__ */ new Map();
+ for (let a2 = 0; a2 < e4.length; a2++) i3 = e4[a2], n3 = i3[t2], r2.has(n3) ? s2 = r2.get(n3) : r2.set(n3, s2 = []), s2.push(i3);
+ return Array.from(r2);
+ }(this.appSegments, "type");
+ this.mergedAppSegments = e3.map(([e4, t2]) => {
+ let i3 = T.get(e4, this.options);
+ if (i3.handleMultiSegments) {
+ return { type: e4, chunk: i3.handleMultiSegments(t2) };
}
- return "#" + d.value;
+ return t2[0];
});
- enter.append("rect").attr("width", "24px").attr("height", "24px").attr("x", "-12px").attr("y", "-12px");
- mapFeatures.merge(enter).attr("transform", transform2);
}
- function drawMapFeatures(selection2) {
- const enabled = svgMapillaryMapFeatures.enabled;
- const service = getService();
- layer = selection2.selectAll(".layer-mapillary-map-features").data(service ? [0] : []);
- layer.exit().remove();
- layer = layer.enter().append("g").attr("class", "layer-mapillary-map-features layer-mapillary-detections").style("display", enabled ? "block" : "none").merge(layer);
- if (enabled) {
- if (service && ~~context.map().zoom() >= minZoom3) {
- editOn();
- update();
- service.loadMapFeatures(projection2);
- service.showFeatureDetections(true);
- } else {
- editOff();
- }
- } else if (service) {
- service.showFeatureDetections(false);
+ getSegment(e3) {
+ return this.appSegments.find((t2) => t2.type === e3);
+ }
+ async getOrFindSegment(e3) {
+ let t2 = this.getSegment(e3);
+ return void 0 === t2 && (await this.findAppSegments(0, [e3]), t2 = this.getSegment(e3)), t2;
+ }
+ };
+ c(he, "type", "jpeg"), w.set("jpeg", he);
+ var ue = [void 0, 1, 1, 2, 4, 8, 1, 1, 2, 4, 8, 4, 8, 4];
+ var ce = class extends re2 {
+ parseHeader() {
+ var e3 = this.chunk.getUint16();
+ 18761 === e3 ? this.le = true : 19789 === e3 && (this.le = false), this.chunk.le = this.le, this.headerParsed = true;
+ }
+ parseTags(e3, t2, i3 = /* @__PURE__ */ new Map()) {
+ let { pick: n3, skip: s2 } = this.options[t2];
+ n3 = new Set(n3);
+ let r2 = n3.size > 0, a2 = 0 === s2.size, o2 = this.chunk.getUint16(e3);
+ e3 += 2;
+ for (let l2 = 0; l2 < o2; l2++) {
+ let o3 = this.chunk.getUint16(e3);
+ if (r2) {
+ if (n3.has(o3) && (i3.set(o3, this.parseTag(e3, o3, t2)), n3.delete(o3), 0 === n3.size)) break;
+ } else !a2 && s2.has(o3) || i3.set(o3, this.parseTag(e3, o3, t2));
+ e3 += 12;
+ }
+ return i3;
+ }
+ parseTag(e3, t2, i3) {
+ let { chunk: n3 } = this, s2 = n3.getUint16(e3 + 2), r2 = n3.getUint32(e3 + 4), a2 = ue[s2];
+ if (a2 * r2 <= 4 ? e3 += 8 : e3 = n3.getUint32(e3 + 8), (s2 < 1 || s2 > 13) && g2("Invalid TIFF value type. block: ".concat(i3.toUpperCase(), ", tag: ").concat(t2.toString(16), ", type: ").concat(s2, ", offset ").concat(e3)), e3 > n3.byteLength && g2("Invalid TIFF value offset. block: ".concat(i3.toUpperCase(), ", tag: ").concat(t2.toString(16), ", type: ").concat(s2, ", offset ").concat(e3, " is outside of chunk size ").concat(n3.byteLength)), 1 === s2) return n3.getUint8Array(e3, r2);
+ if (2 === s2) return m(n3.getString(e3, r2));
+ if (7 === s2) return n3.getUint8Array(e3, r2);
+ if (1 === r2) return this.parseTagValue(s2, e3);
+ {
+ let t3 = new (function(e4) {
+ switch (e4) {
+ case 1:
+ return Uint8Array;
+ case 3:
+ return Uint16Array;
+ case 4:
+ return Uint32Array;
+ case 5:
+ return Array;
+ case 6:
+ return Int8Array;
+ case 8:
+ return Int16Array;
+ case 9:
+ return Int32Array;
+ case 10:
+ return Array;
+ case 11:
+ return Float32Array;
+ case 12:
+ return Float64Array;
+ default:
+ return Array;
+ }
+ }(s2))(r2), i4 = a2;
+ for (let n4 = 0; n4 < r2; n4++) t3[n4] = this.parseTagValue(s2, e3), e3 += i4;
+ return t3;
+ }
+ }
+ parseTagValue(e3, t2) {
+ let { chunk: i3 } = this;
+ switch (e3) {
+ case 1:
+ return i3.getUint8(t2);
+ case 3:
+ return i3.getUint16(t2);
+ case 4:
+ return i3.getUint32(t2);
+ case 5:
+ return i3.getUint32(t2) / i3.getUint32(t2 + 4);
+ case 6:
+ return i3.getInt8(t2);
+ case 8:
+ return i3.getInt16(t2);
+ case 9:
+ return i3.getInt32(t2);
+ case 10:
+ return i3.getInt32(t2) / i3.getInt32(t2 + 4);
+ case 11:
+ return i3.getFloat(t2);
+ case 12:
+ return i3.getDouble(t2);
+ case 13:
+ return i3.getUint32(t2);
+ default:
+ g2("Invalid tiff type ".concat(e3));
}
}
- drawMapFeatures.enabled = function(_) {
- if (!arguments.length)
- return svgMapillaryMapFeatures.enabled;
- svgMapillaryMapFeatures.enabled = _;
- if (svgMapillaryMapFeatures.enabled) {
- showLayer();
- context.photos().on("change.mapillary_map_features", update);
+ };
+ var fe = class extends ce {
+ static canHandle(e3, t2) {
+ return 225 === e3.getUint8(t2 + 1) && 1165519206 === e3.getUint32(t2 + 4) && 0 === e3.getUint16(t2 + 8);
+ }
+ async parse() {
+ this.parseHeader();
+ let { options: e3 } = this;
+ return e3.ifd0.enabled && await this.parseIfd0Block(), e3.exif.enabled && await this.safeParse("parseExifBlock"), e3.gps.enabled && await this.safeParse("parseGpsBlock"), e3.interop.enabled && await this.safeParse("parseInteropBlock"), e3.ifd1.enabled && await this.safeParse("parseThumbnailBlock"), this.createOutput();
+ }
+ safeParse(e3) {
+ let t2 = this[e3]();
+ return void 0 !== t2.catch && (t2 = t2.catch(this.handleError)), t2;
+ }
+ findIfd0Offset() {
+ void 0 === this.ifd0Offset && (this.ifd0Offset = this.chunk.getUint32(4));
+ }
+ findIfd1Offset() {
+ if (void 0 === this.ifd1Offset) {
+ this.findIfd0Offset();
+ let e3 = this.chunk.getUint16(this.ifd0Offset), t2 = this.ifd0Offset + 2 + 12 * e3;
+ this.ifd1Offset = this.chunk.getUint32(t2);
+ }
+ }
+ parseBlock(e3, t2) {
+ let i3 = /* @__PURE__ */ new Map();
+ return this[t2] = i3, this.parseTags(e3, t2, i3), i3;
+ }
+ async parseIfd0Block() {
+ if (this.ifd0) return;
+ let { file: e3 } = this;
+ this.findIfd0Offset(), this.ifd0Offset < 8 && g2("Malformed EXIF data"), !e3.chunked && this.ifd0Offset > e3.byteLength && g2("IFD0 offset points to outside of file.\nthis.ifd0Offset: ".concat(this.ifd0Offset, ", file.byteLength: ").concat(e3.byteLength)), e3.tiff && await e3.ensureChunk(this.ifd0Offset, S(this.options));
+ let t2 = this.parseBlock(this.ifd0Offset, "ifd0");
+ return 0 !== t2.size ? (this.exifOffset = t2.get(34665), this.interopOffset = t2.get(40965), this.gpsOffset = t2.get(34853), this.xmp = t2.get(700), this.iptc = t2.get(33723), this.icc = t2.get(34675), this.options.sanitize && (t2.delete(34665), t2.delete(40965), t2.delete(34853), t2.delete(700), t2.delete(33723), t2.delete(34675)), t2) : void 0;
+ }
+ async parseExifBlock() {
+ if (this.exif) return;
+ if (this.ifd0 || await this.parseIfd0Block(), void 0 === this.exifOffset) return;
+ this.file.tiff && await this.file.ensureChunk(this.exifOffset, S(this.options));
+ let e3 = this.parseBlock(this.exifOffset, "exif");
+ return this.interopOffset || (this.interopOffset = e3.get(40965)), this.makerNote = e3.get(37500), this.userComment = e3.get(37510), this.options.sanitize && (e3.delete(40965), e3.delete(37500), e3.delete(37510)), this.unpack(e3, 41728), this.unpack(e3, 41729), e3;
+ }
+ unpack(e3, t2) {
+ let i3 = e3.get(t2);
+ i3 && 1 === i3.length && e3.set(t2, i3[0]);
+ }
+ async parseGpsBlock() {
+ if (this.gps) return;
+ if (this.ifd0 || await this.parseIfd0Block(), void 0 === this.gpsOffset) return;
+ let e3 = this.parseBlock(this.gpsOffset, "gps");
+ return e3 && e3.has(2) && e3.has(4) && (e3.set("latitude", de(...e3.get(2), e3.get(1))), e3.set("longitude", de(...e3.get(4), e3.get(3)))), e3;
+ }
+ async parseInteropBlock() {
+ if (!this.interop && (this.ifd0 || await this.parseIfd0Block(), void 0 !== this.interopOffset || this.exif || await this.parseExifBlock(), void 0 !== this.interopOffset)) return this.parseBlock(this.interopOffset, "interop");
+ }
+ async parseThumbnailBlock(e3 = false) {
+ if (!this.ifd1 && !this.ifd1Parsed && (!this.options.mergeOutput || e3)) return this.findIfd1Offset(), this.ifd1Offset > 0 && (this.parseBlock(this.ifd1Offset, "ifd1"), this.ifd1Parsed = true), this.ifd1;
+ }
+ async extractThumbnail() {
+ if (this.headerParsed || this.parseHeader(), this.ifd1Parsed || await this.parseThumbnailBlock(true), void 0 === this.ifd1) return;
+ let e3 = this.ifd1.get(513), t2 = this.ifd1.get(514);
+ return this.chunk.getUint8Array(e3, t2);
+ }
+ get image() {
+ return this.ifd0;
+ }
+ get thumbnail() {
+ return this.ifd1;
+ }
+ createOutput() {
+ let e3, t2, i3, n3 = {};
+ for (t2 of H) if (e3 = this[t2], !p(e3)) if (i3 = this.canTranslate ? this.translateBlock(e3, t2) : Object.fromEntries(e3), this.options.mergeOutput) {
+ if ("ifd1" === t2) continue;
+ Object.assign(n3, i3);
+ } else n3[t2] = i3;
+ return this.makerNote && (n3.makerNote = this.makerNote), this.userComment && (n3.userComment = this.userComment), n3;
+ }
+ assignToOutput(e3, t2) {
+ if (this.globalOptions.mergeOutput) Object.assign(e3, t2);
+ else for (let [i3, n3] of Object.entries(t2)) this.assignObjectToOutput(e3, i3, n3);
+ }
+ };
+ function de(e3, t2, i3, n3) {
+ var s2 = e3 + t2 / 60 + i3 / 3600;
+ return "S" !== n3 && "W" !== n3 || (s2 *= -1), s2;
+ }
+ c(fe, "type", "tiff"), c(fe, "headerLength", 10), T.set("tiff", fe);
+ var pe = Object.freeze({ __proto__: null, default: ne, Exifr: te, fileParsers: w, segmentParsers: T, fileReaders: A, tagKeys: E, tagValues: B, tagRevivers: N, createDictionary: U, extendDictionary: F, fetchUrlAsArrayBuffer: M, readBlobAsArrayBuffer: R, chunkedProps: G, otherSegments: V, segments: z, tiffBlocks: H, segmentsAndBlocks: j, tiffExtractables: W, inheritables: K, allFormatters: X, Options: q, parse: ie });
+ var ge = { ifd0: false, ifd1: false, exif: false, gps: false, interop: false, sanitize: false, reviveValues: true, translateKeys: false, translateValues: false, mergeOutput: false };
+ var me = Object.assign({}, ge, { firstChunkSize: 4e4, gps: [1, 2, 3, 4] });
+ async function Se(e3) {
+ let t2 = new te(me);
+ await t2.read(e3);
+ let i3 = await t2.parse();
+ if (i3 && i3.gps) {
+ let { latitude: e4, longitude: t3 } = i3.gps;
+ return { latitude: e4, longitude: t3 };
+ }
+ }
+ var Ce = Object.assign({}, ge, { tiff: false, ifd1: true, mergeOutput: false });
+ async function ye(e3) {
+ let t2 = new te(Ce);
+ await t2.read(e3);
+ let i3 = await t2.extractThumbnail();
+ return i3 && a ? s.from(i3) : i3;
+ }
+ async function be(e3) {
+ let t2 = await this.thumbnail(e3);
+ if (void 0 !== t2) {
+ let e4 = new Blob([t2]);
+ return URL.createObjectURL(e4);
+ }
+ }
+ var Ie = Object.assign({}, ge, { firstChunkSize: 4e4, ifd0: [274] });
+ async function Pe(e3) {
+ let t2 = new te(Ie);
+ await t2.read(e3);
+ let i3 = await t2.parse();
+ if (i3 && i3.ifd0) return i3.ifd0[274];
+ }
+ var ke = Object.freeze({ 1: { dimensionSwapped: false, scaleX: 1, scaleY: 1, deg: 0, rad: 0 }, 2: { dimensionSwapped: false, scaleX: -1, scaleY: 1, deg: 0, rad: 0 }, 3: { dimensionSwapped: false, scaleX: 1, scaleY: 1, deg: 180, rad: 180 * Math.PI / 180 }, 4: { dimensionSwapped: false, scaleX: -1, scaleY: 1, deg: 180, rad: 180 * Math.PI / 180 }, 5: { dimensionSwapped: true, scaleX: 1, scaleY: -1, deg: 90, rad: 90 * Math.PI / 180 }, 6: { dimensionSwapped: true, scaleX: 1, scaleY: 1, deg: 90, rad: 90 * Math.PI / 180 }, 7: { dimensionSwapped: true, scaleX: 1, scaleY: -1, deg: 270, rad: 270 * Math.PI / 180 }, 8: { dimensionSwapped: true, scaleX: 1, scaleY: 1, deg: 270, rad: 270 * Math.PI / 180 } });
+ var we = true;
+ var Te = true;
+ if ("object" == typeof navigator) {
+ let e3 = navigator.userAgent;
+ if (e3.includes("iPad") || e3.includes("iPhone")) {
+ let t2 = e3.match(/OS (\d+)_(\d+)/);
+ if (t2) {
+ let [, e4, i3] = t2, n3 = Number(e4) + 0.1 * Number(i3);
+ we = n3 < 13.4, Te = false;
+ }
+ } else if (e3.includes("OS X 10")) {
+ let [, t2] = e3.match(/OS X 10[_.](\d+)/);
+ we = Te = Number(t2) < 15;
+ }
+ if (e3.includes("Chrome/")) {
+ let [, t2] = e3.match(/Chrome\/(\d+)/);
+ we = Te = Number(t2) < 81;
+ } else if (e3.includes("Firefox/")) {
+ let [, t2] = e3.match(/Firefox\/(\d+)/);
+ we = Te = Number(t2) < 77;
+ }
+ }
+ async function Ae(e3) {
+ let t2 = await Pe(e3);
+ return Object.assign({ canvas: we, css: Te }, ke[t2]);
+ }
+ var De = class extends I {
+ constructor(...e3) {
+ super(...e3), c(this, "ranges", new Oe()), 0 !== this.byteLength && this.ranges.add(0, this.byteLength);
+ }
+ _tryExtend(e3, t2, i3) {
+ if (0 === e3 && 0 === this.byteLength && i3) {
+ let e4 = new DataView(i3.buffer || i3, i3.byteOffset, i3.byteLength);
+ this._swapDataView(e4);
} else {
- hideLayer();
- context.photos().on("change.mapillary_map_features", null);
+ let i4 = e3 + t2;
+ if (i4 > this.byteLength) {
+ let { dataView: e4 } = this._extend(i4);
+ this._swapDataView(e4);
+ }
}
- dispatch10.call("change");
- return this;
- };
- drawMapFeatures.supported = function() {
- return !!getService();
- };
- init2();
- return drawMapFeatures;
+ }
+ _extend(e3) {
+ let t2;
+ t2 = a ? s.allocUnsafe(e3) : new Uint8Array(e3);
+ let i3 = new DataView(t2.buffer, t2.byteOffset, t2.byteLength);
+ return t2.set(new Uint8Array(this.buffer, this.byteOffset, this.byteLength), 0), { uintView: t2, dataView: i3 };
+ }
+ subarray(e3, t2, i3 = false) {
+ return t2 = t2 || this._lengthToEnd(e3), i3 && this._tryExtend(e3, t2), this.ranges.add(e3, t2), super.subarray(e3, t2);
+ }
+ set(e3, t2, i3 = false) {
+ i3 && this._tryExtend(t2, e3.byteLength, e3);
+ let n3 = super.set(e3, t2);
+ return this.ranges.add(t2, n3.byteLength), n3;
+ }
+ async ensureChunk(e3, t2) {
+ this.chunked && (this.ranges.available(e3, t2) || await this.readChunk(e3, t2));
+ }
+ available(e3, t2) {
+ return this.ranges.available(e3, t2);
+ }
+ };
+ var Oe = class {
+ constructor() {
+ c(this, "list", []);
+ }
+ get length() {
+ return this.list.length;
+ }
+ add(e3, t2, i3 = 0) {
+ let n3 = e3 + t2, s2 = this.list.filter((t3) => xe(e3, t3.offset, n3) || xe(e3, t3.end, n3));
+ if (s2.length > 0) {
+ e3 = Math.min(e3, ...s2.map((e4) => e4.offset)), n3 = Math.max(n3, ...s2.map((e4) => e4.end)), t2 = n3 - e3;
+ let i4 = s2.shift();
+ i4.offset = e3, i4.length = t2, i4.end = n3, this.list = this.list.filter((e4) => !s2.includes(e4));
+ } else this.list.push({ offset: e3, length: t2, end: n3 });
+ }
+ available(e3, t2) {
+ let i3 = e3 + t2;
+ return this.list.some((t3) => t3.offset <= e3 && i3 <= t3.end);
+ }
+ };
+ function xe(e3, t2, i3) {
+ return e3 <= t2 && t2 <= i3;
}
-
- // modules/svg/kartaview_images.js
- function svgKartaviewImages(projection2, context, dispatch10) {
- var throttledRedraw = throttle_default(function() {
- dispatch10.call("change");
- }, 1e3);
- var minZoom3 = 12;
- var minMarkerZoom = 16;
- var minViewfieldZoom = 18;
- var layer = select_default2(null);
- var _kartaview;
- function init2() {
- if (svgKartaviewImages.initialized)
- return;
- svgKartaviewImages.enabled = false;
- svgKartaviewImages.initialized = true;
+ var ve = class extends De {
+ constructor(e3, t2) {
+ super(0), c(this, "chunksRead", 0), this.input = e3, this.options = t2;
}
- function getService() {
- if (services.kartaview && !_kartaview) {
- _kartaview = services.kartaview;
- _kartaview.event.on("loadedImages", throttledRedraw);
- } else if (!services.kartaview && _kartaview) {
- _kartaview = null;
- }
- return _kartaview;
+ async readWhole() {
+ this.chunked = false, await this.readChunk(this.nextChunkOffset);
}
- function showLayer() {
- var service = getService();
- if (!service)
- return;
- editOn();
- layer.style("opacity", 0).transition().duration(250).style("opacity", 1).on("end", function() {
- dispatch10.call("change");
- });
+ async readChunked() {
+ this.chunked = true, await this.readChunk(0, this.options.firstChunkSize);
}
- function hideLayer() {
- throttledRedraw.cancel();
- layer.transition().duration(250).style("opacity", 0).on("end", editOff);
+ async readNextChunk(e3 = this.nextChunkOffset) {
+ if (this.fullyRead) return this.chunksRead++, false;
+ let t2 = this.options.chunkSize, i3 = await this.readChunk(e3, t2);
+ return !!i3 && i3.byteLength === t2;
}
- function editOn() {
- layer.style("display", "block");
+ async readChunk(e3, t2) {
+ if (this.chunksRead++, 0 !== (t2 = this.safeWrapAddress(e3, t2))) return this._readChunk(e3, t2);
}
- function editOff() {
- layer.selectAll(".viewfield-group").remove();
- layer.style("display", "none");
+ safeWrapAddress(e3, t2) {
+ return void 0 !== this.size && e3 + t2 > this.size ? Math.max(0, this.size - e3) : t2;
}
- function click(d3_event, d) {
- var service = getService();
- if (!service)
- return;
- service.ensureViewerLoaded(context).then(function() {
- service.selectImage(context, d.key).showViewer(context);
- });
- context.map().centerEase(d.loc);
+ get nextChunkOffset() {
+ if (0 !== this.ranges.list.length) return this.ranges.list[0].length;
}
- function mouseover(d3_event, d) {
- var service = getService();
- if (service)
- service.setStyles(context, d);
+ get canReadNextChunk() {
+ return this.chunksRead < this.options.chunkLimit;
}
- function mouseout() {
- var service = getService();
- if (service)
- service.setStyles(context, null);
+ get fullyRead() {
+ return void 0 !== this.size && this.nextChunkOffset === this.size;
}
- function transform2(d) {
- var t = svgPointTransform(projection2)(d);
- if (d.ca) {
- t += " rotate(" + Math.floor(d.ca) + ",0,0)";
- }
- return t;
+ read() {
+ return this.options.chunked ? this.readChunked() : this.readWhole();
}
- function filterImages(images) {
- var fromDate = context.photos().fromDate();
- var toDate = context.photos().toDate();
- var usernames = context.photos().usernames();
- if (fromDate) {
- var fromTimestamp = new Date(fromDate).getTime();
- images = images.filter(function(item) {
- return new Date(item.captured_at).getTime() >= fromTimestamp;
- });
+ close() {
+ }
+ };
+ A.set("blob", class extends ve {
+ async readWhole() {
+ this.chunked = false;
+ let e3 = await R(this.input);
+ this._swapArrayBuffer(e3);
+ }
+ readChunked() {
+ return this.chunked = true, this.size = this.input.size, super.readChunked();
+ }
+ async _readChunk(e3, t2) {
+ let i3 = t2 ? e3 + t2 : void 0, n3 = this.input.slice(e3, i3), s2 = await R(n3);
+ return this.set(s2, e3, true);
+ }
+ });
+ var Me = Object.freeze({ __proto__: null, default: pe, Exifr: te, fileParsers: w, segmentParsers: T, fileReaders: A, tagKeys: E, tagValues: B, tagRevivers: N, createDictionary: U, extendDictionary: F, fetchUrlAsArrayBuffer: M, readBlobAsArrayBuffer: R, chunkedProps: G, otherSegments: V, segments: z, tiffBlocks: H, segmentsAndBlocks: j, tiffExtractables: W, inheritables: K, allFormatters: X, Options: q, parse: ie, gpsOnlyOptions: me, gps: Se, thumbnailOnlyOptions: Ce, thumbnail: ye, thumbnailUrl: be, orientationOnlyOptions: Ie, orientation: Pe, rotations: ke, get rotateCanvas() {
+ return we;
+ }, get rotateCss() {
+ return Te;
+ }, rotation: Ae });
+ A.set("url", class extends ve {
+ async readWhole() {
+ this.chunked = false;
+ let e3 = await M(this.input);
+ e3 instanceof ArrayBuffer ? this._swapArrayBuffer(e3) : e3 instanceof Uint8Array && this._swapBuffer(e3);
+ }
+ async _readChunk(e3, t2) {
+ let i3 = t2 ? e3 + t2 - 1 : void 0, n3 = this.options.httpHeaders || {};
+ (e3 || i3) && (n3.range = "bytes=".concat([e3, i3].join("-")));
+ let s2 = await h(this.input, { headers: n3 }), r2 = await s2.arrayBuffer(), a2 = r2.byteLength;
+ if (416 !== s2.status) return a2 !== t2 && (this.size = e3 + a2), this.set(r2, e3, true);
+ }
+ });
+ I.prototype.getUint64 = function(e3) {
+ let t2 = this.getUint32(e3), i3 = this.getUint32(e3 + 4);
+ return t2 < 1048575 ? t2 << 32 | i3 : void 0 !== typeof r ? (console.warn("Using BigInt because of type 64uint but JS can only handle 53b numbers."), r(t2) << r(32) | r(i3)) : void g2("Trying to read 64b value but JS can only handle 53b numbers.");
+ };
+ var Re = class extends se {
+ parseBoxes(e3 = 0) {
+ let t2 = [];
+ for (; e3 < this.file.byteLength - 4; ) {
+ let i3 = this.parseBoxHead(e3);
+ if (t2.push(i3), 0 === i3.length) break;
+ e3 += i3.length;
}
- if (toDate) {
- var toTimestamp = new Date(toDate).getTime();
- images = images.filter(function(item) {
- return new Date(item.captured_at).getTime() <= toTimestamp;
- });
+ return t2;
+ }
+ parseSubBoxes(e3) {
+ e3.boxes = this.parseBoxes(e3.start);
+ }
+ findBox(e3, t2) {
+ return void 0 === e3.boxes && this.parseSubBoxes(e3), e3.boxes.find((e4) => e4.kind === t2);
+ }
+ parseBoxHead(e3) {
+ let t2 = this.file.getUint32(e3), i3 = this.file.getString(e3 + 4, 4), n3 = e3 + 8;
+ return 1 === t2 && (t2 = this.file.getUint64(e3 + 8), n3 += 8), { offset: e3, length: t2, kind: i3, start: n3 };
+ }
+ parseBoxFullHead(e3) {
+ if (void 0 !== e3.version) return;
+ let t2 = this.file.getUint32(e3.start);
+ e3.version = t2 >> 24, e3.start += 4;
+ }
+ };
+ var Le = class extends Re {
+ static canHandle(e3, t2) {
+ if (0 !== t2) return false;
+ let i3 = e3.getUint16(2);
+ if (i3 > 50) return false;
+ let n3 = 16, s2 = [];
+ for (; n3 < i3; ) s2.push(e3.getString(n3, 4)), n3 += 4;
+ return s2.includes(this.type);
+ }
+ async parse() {
+ let e3 = this.file.getUint32(0), t2 = this.parseBoxHead(e3);
+ for (; "meta" !== t2.kind; ) e3 += t2.length, await this.file.ensureChunk(e3, 16), t2 = this.parseBoxHead(e3);
+ await this.file.ensureChunk(t2.offset, t2.length), this.parseBoxFullHead(t2), this.parseSubBoxes(t2), this.options.icc.enabled && await this.findIcc(t2), this.options.tiff.enabled && await this.findExif(t2);
+ }
+ async registerSegment(e3, t2, i3) {
+ await this.file.ensureChunk(t2, i3);
+ let n3 = this.file.subarray(t2, i3);
+ this.createParser(e3, n3);
+ }
+ async findIcc(e3) {
+ let t2 = this.findBox(e3, "iprp");
+ if (void 0 === t2) return;
+ let i3 = this.findBox(t2, "ipco");
+ if (void 0 === i3) return;
+ let n3 = this.findBox(i3, "colr");
+ void 0 !== n3 && await this.registerSegment("icc", n3.offset + 12, n3.length);
+ }
+ async findExif(e3) {
+ let t2 = this.findBox(e3, "iinf");
+ if (void 0 === t2) return;
+ let i3 = this.findBox(e3, "iloc");
+ if (void 0 === i3) return;
+ let n3 = this.findExifLocIdInIinf(t2), s2 = this.findExtentInIloc(i3, n3);
+ if (void 0 === s2) return;
+ let [r2, a2] = s2;
+ await this.file.ensureChunk(r2, a2);
+ let o2 = 4 + this.file.getUint32(r2);
+ r2 += o2, a2 -= o2, await this.registerSegment("tiff", r2, a2);
+ }
+ findExifLocIdInIinf(e3) {
+ this.parseBoxFullHead(e3);
+ let t2, i3, n3, s2, r2 = e3.start, a2 = this.file.getUint16(r2);
+ for (r2 += 2; a2--; ) {
+ if (t2 = this.parseBoxHead(r2), this.parseBoxFullHead(t2), i3 = t2.start, t2.version >= 2 && (n3 = 3 === t2.version ? 4 : 2, s2 = this.file.getString(i3 + n3 + 2, 4), "Exif" === s2)) return this.file.getUintBytes(i3, n3);
+ r2 += t2.length;
+ }
+ }
+ get8bits(e3) {
+ let t2 = this.file.getUint8(e3);
+ return [t2 >> 4, 15 & t2];
+ }
+ findExtentInIloc(e3, t2) {
+ this.parseBoxFullHead(e3);
+ let i3 = e3.start, [n3, s2] = this.get8bits(i3++), [r2, a2] = this.get8bits(i3++), o2 = 2 === e3.version ? 4 : 2, l2 = 1 === e3.version || 2 === e3.version ? 2 : 0, h2 = a2 + n3 + s2, u2 = 2 === e3.version ? 4 : 2, c2 = this.file.getUintBytes(i3, u2);
+ for (i3 += u2; c2--; ) {
+ let e4 = this.file.getUintBytes(i3, o2);
+ i3 += o2 + l2 + 2 + r2;
+ let u3 = this.file.getUint16(i3);
+ if (i3 += 2, e4 === t2) return u3 > 1 && console.warn("ILOC box has more than one extent but we're only processing one\nPlease create an issue at https://github.com/MikeKovarik/exifr with this file"), [this.file.getUintBytes(i3 + a2, n3), this.file.getUintBytes(i3 + a2 + n3, s2)];
+ i3 += u3 * h2;
}
- if (usernames) {
- images = images.filter(function(item) {
- return usernames.indexOf(item.captured_by) !== -1;
+ }
+ };
+ var Ue = class extends Le {
+ };
+ c(Ue, "type", "heic");
+ var Fe = class extends Le {
+ };
+ c(Fe, "type", "avif"), w.set("heic", Ue), w.set("avif", Fe), U(E, ["ifd0", "ifd1"], [[256, "ImageWidth"], [257, "ImageHeight"], [258, "BitsPerSample"], [259, "Compression"], [262, "PhotometricInterpretation"], [270, "ImageDescription"], [271, "Make"], [272, "Model"], [273, "StripOffsets"], [274, "Orientation"], [277, "SamplesPerPixel"], [278, "RowsPerStrip"], [279, "StripByteCounts"], [282, "XResolution"], [283, "YResolution"], [284, "PlanarConfiguration"], [296, "ResolutionUnit"], [301, "TransferFunction"], [305, "Software"], [306, "ModifyDate"], [315, "Artist"], [316, "HostComputer"], [317, "Predictor"], [318, "WhitePoint"], [319, "PrimaryChromaticities"], [513, "ThumbnailOffset"], [514, "ThumbnailLength"], [529, "YCbCrCoefficients"], [530, "YCbCrSubSampling"], [531, "YCbCrPositioning"], [532, "ReferenceBlackWhite"], [700, "ApplicationNotes"], [33432, "Copyright"], [33723, "IPTC"], [34665, "ExifIFD"], [34675, "ICC"], [34853, "GpsIFD"], [330, "SubIFD"], [40965, "InteropIFD"], [40091, "XPTitle"], [40092, "XPComment"], [40093, "XPAuthor"], [40094, "XPKeywords"], [40095, "XPSubject"]]), U(E, "exif", [[33434, "ExposureTime"], [33437, "FNumber"], [34850, "ExposureProgram"], [34852, "SpectralSensitivity"], [34855, "ISO"], [34858, "TimeZoneOffset"], [34859, "SelfTimerMode"], [34864, "SensitivityType"], [34865, "StandardOutputSensitivity"], [34866, "RecommendedExposureIndex"], [34867, "ISOSpeed"], [34868, "ISOSpeedLatitudeyyy"], [34869, "ISOSpeedLatitudezzz"], [36864, "ExifVersion"], [36867, "DateTimeOriginal"], [36868, "CreateDate"], [36873, "GooglePlusUploadCode"], [36880, "OffsetTime"], [36881, "OffsetTimeOriginal"], [36882, "OffsetTimeDigitized"], [37121, "ComponentsConfiguration"], [37122, "CompressedBitsPerPixel"], [37377, "ShutterSpeedValue"], [37378, "ApertureValue"], [37379, "BrightnessValue"], [37380, "ExposureCompensation"], [37381, "MaxApertureValue"], [37382, "SubjectDistance"], [37383, "MeteringMode"], [37384, "LightSource"], [37385, "Flash"], [37386, "FocalLength"], [37393, "ImageNumber"], [37394, "SecurityClassification"], [37395, "ImageHistory"], [37396, "SubjectArea"], [37500, "MakerNote"], [37510, "UserComment"], [37520, "SubSecTime"], [37521, "SubSecTimeOriginal"], [37522, "SubSecTimeDigitized"], [37888, "AmbientTemperature"], [37889, "Humidity"], [37890, "Pressure"], [37891, "WaterDepth"], [37892, "Acceleration"], [37893, "CameraElevationAngle"], [40960, "FlashpixVersion"], [40961, "ColorSpace"], [40962, "ExifImageWidth"], [40963, "ExifImageHeight"], [40964, "RelatedSoundFile"], [41483, "FlashEnergy"], [41486, "FocalPlaneXResolution"], [41487, "FocalPlaneYResolution"], [41488, "FocalPlaneResolutionUnit"], [41492, "SubjectLocation"], [41493, "ExposureIndex"], [41495, "SensingMethod"], [41728, "FileSource"], [41729, "SceneType"], [41730, "CFAPattern"], [41985, "CustomRendered"], [41986, "ExposureMode"], [41987, "WhiteBalance"], [41988, "DigitalZoomRatio"], [41989, "FocalLengthIn35mmFormat"], [41990, "SceneCaptureType"], [41991, "GainControl"], [41992, "Contrast"], [41993, "Saturation"], [41994, "Sharpness"], [41996, "SubjectDistanceRange"], [42016, "ImageUniqueID"], [42032, "OwnerName"], [42033, "SerialNumber"], [42034, "LensInfo"], [42035, "LensMake"], [42036, "LensModel"], [42037, "LensSerialNumber"], [42080, "CompositeImage"], [42081, "CompositeImageCount"], [42082, "CompositeImageExposureTimes"], [42240, "Gamma"], [59932, "Padding"], [59933, "OffsetSchema"], [65e3, "OwnerName"], [65001, "SerialNumber"], [65002, "Lens"], [65100, "RawFile"], [65101, "Converter"], [65102, "WhiteBalance"], [65105, "Exposure"], [65106, "Shadows"], [65107, "Brightness"], [65108, "Contrast"], [65109, "Saturation"], [65110, "Sharpness"], [65111, "Smoothness"], [65112, "MoireFilter"], [40965, "InteropIFD"]]), U(E, "gps", [[0, "GPSVersionID"], [1, "GPSLatitudeRef"], [2, "GPSLatitude"], [3, "GPSLongitudeRef"], [4, "GPSLongitude"], [5, "GPSAltitudeRef"], [6, "GPSAltitude"], [7, "GPSTimeStamp"], [8, "GPSSatellites"], [9, "GPSStatus"], [10, "GPSMeasureMode"], [11, "GPSDOP"], [12, "GPSSpeedRef"], [13, "GPSSpeed"], [14, "GPSTrackRef"], [15, "GPSTrack"], [16, "GPSImgDirectionRef"], [17, "GPSImgDirection"], [18, "GPSMapDatum"], [19, "GPSDestLatitudeRef"], [20, "GPSDestLatitude"], [21, "GPSDestLongitudeRef"], [22, "GPSDestLongitude"], [23, "GPSDestBearingRef"], [24, "GPSDestBearing"], [25, "GPSDestDistanceRef"], [26, "GPSDestDistance"], [27, "GPSProcessingMethod"], [28, "GPSAreaInformation"], [29, "GPSDateStamp"], [30, "GPSDifferential"], [31, "GPSHPositioningError"]]), U(B, ["ifd0", "ifd1"], [[274, { 1: "Horizontal (normal)", 2: "Mirror horizontal", 3: "Rotate 180", 4: "Mirror vertical", 5: "Mirror horizontal and rotate 270 CW", 6: "Rotate 90 CW", 7: "Mirror horizontal and rotate 90 CW", 8: "Rotate 270 CW" }], [296, { 1: "None", 2: "inches", 3: "cm" }]]);
+ var Ee = U(B, "exif", [[34850, { 0: "Not defined", 1: "Manual", 2: "Normal program", 3: "Aperture priority", 4: "Shutter priority", 5: "Creative program", 6: "Action program", 7: "Portrait mode", 8: "Landscape mode" }], [37121, { 0: "-", 1: "Y", 2: "Cb", 3: "Cr", 4: "R", 5: "G", 6: "B" }], [37383, { 0: "Unknown", 1: "Average", 2: "CenterWeightedAverage", 3: "Spot", 4: "MultiSpot", 5: "Pattern", 6: "Partial", 255: "Other" }], [37384, { 0: "Unknown", 1: "Daylight", 2: "Fluorescent", 3: "Tungsten (incandescent light)", 4: "Flash", 9: "Fine weather", 10: "Cloudy weather", 11: "Shade", 12: "Daylight fluorescent (D 5700 - 7100K)", 13: "Day white fluorescent (N 4600 - 5400K)", 14: "Cool white fluorescent (W 3900 - 4500K)", 15: "White fluorescent (WW 3200 - 3700K)", 17: "Standard light A", 18: "Standard light B", 19: "Standard light C", 20: "D55", 21: "D65", 22: "D75", 23: "D50", 24: "ISO studio tungsten", 255: "Other" }], [37385, { 0: "Flash did not fire", 1: "Flash fired", 5: "Strobe return light not detected", 7: "Strobe return light detected", 9: "Flash fired, compulsory flash mode", 13: "Flash fired, compulsory flash mode, return light not detected", 15: "Flash fired, compulsory flash mode, return light detected", 16: "Flash did not fire, compulsory flash mode", 24: "Flash did not fire, auto mode", 25: "Flash fired, auto mode", 29: "Flash fired, auto mode, return light not detected", 31: "Flash fired, auto mode, return light detected", 32: "No flash function", 65: "Flash fired, red-eye reduction mode", 69: "Flash fired, red-eye reduction mode, return light not detected", 71: "Flash fired, red-eye reduction mode, return light detected", 73: "Flash fired, compulsory flash mode, red-eye reduction mode", 77: "Flash fired, compulsory flash mode, red-eye reduction mode, return light not detected", 79: "Flash fired, compulsory flash mode, red-eye reduction mode, return light detected", 89: "Flash fired, auto mode, red-eye reduction mode", 93: "Flash fired, auto mode, return light not detected, red-eye reduction mode", 95: "Flash fired, auto mode, return light detected, red-eye reduction mode" }], [41495, { 1: "Not defined", 2: "One-chip color area sensor", 3: "Two-chip color area sensor", 4: "Three-chip color area sensor", 5: "Color sequential area sensor", 7: "Trilinear sensor", 8: "Color sequential linear sensor" }], [41728, { 1: "Film Scanner", 2: "Reflection Print Scanner", 3: "Digital Camera" }], [41729, { 1: "Directly photographed" }], [41985, { 0: "Normal", 1: "Custom", 2: "HDR (no original saved)", 3: "HDR (original saved)", 4: "Original (for HDR)", 6: "Panorama", 7: "Portrait HDR", 8: "Portrait" }], [41986, { 0: "Auto", 1: "Manual", 2: "Auto bracket" }], [41987, { 0: "Auto", 1: "Manual" }], [41990, { 0: "Standard", 1: "Landscape", 2: "Portrait", 3: "Night", 4: "Other" }], [41991, { 0: "None", 1: "Low gain up", 2: "High gain up", 3: "Low gain down", 4: "High gain down" }], [41996, { 0: "Unknown", 1: "Macro", 2: "Close", 3: "Distant" }], [42080, { 0: "Unknown", 1: "Not a Composite Image", 2: "General Composite Image", 3: "Composite Image Captured While Shooting" }]]);
+ var Be = { 1: "No absolute unit of measurement", 2: "Inch", 3: "Centimeter" };
+ Ee.set(37392, Be), Ee.set(41488, Be);
+ var Ne = { 0: "Normal", 1: "Low", 2: "High" };
+ function Ge(e3) {
+ return "object" == typeof e3 && void 0 !== e3.length ? e3[0] : e3;
+ }
+ function Ve(e3) {
+ let t2 = Array.from(e3).slice(1);
+ return t2[1] > 15 && (t2 = t2.map((e4) => String.fromCharCode(e4))), "0" !== t2[2] && 0 !== t2[2] || t2.pop(), t2.join(".");
+ }
+ function ze(e3) {
+ if ("string" == typeof e3) {
+ var [t2, i3, n3, s2, r2, a2] = e3.trim().split(/[-: ]/g).map(Number), o2 = new Date(t2, i3 - 1, n3);
+ return Number.isNaN(s2) || Number.isNaN(r2) || Number.isNaN(a2) || (o2.setHours(s2), o2.setMinutes(r2), o2.setSeconds(a2)), Number.isNaN(+o2) ? e3 : o2;
+ }
+ }
+ function He(e3) {
+ if ("string" == typeof e3) return e3;
+ let t2 = [];
+ if (0 === e3[1] && 0 === e3[e3.length - 1]) for (let i3 = 0; i3 < e3.length; i3 += 2) t2.push(je(e3[i3 + 1], e3[i3]));
+ else for (let i3 = 0; i3 < e3.length; i3 += 2) t2.push(je(e3[i3], e3[i3 + 1]));
+ return m(String.fromCodePoint(...t2));
+ }
+ function je(e3, t2) {
+ return e3 << 8 | t2;
+ }
+ Ee.set(41992, Ne), Ee.set(41993, Ne), Ee.set(41994, Ne), U(N, ["ifd0", "ifd1"], [[50827, function(e3) {
+ return "string" != typeof e3 ? b(e3) : e3;
+ }], [306, ze], [40091, He], [40092, He], [40093, He], [40094, He], [40095, He]]), U(N, "exif", [[40960, Ve], [36864, Ve], [36867, ze], [36868, ze], [40962, Ge], [40963, Ge]]), U(N, "gps", [[0, (e3) => Array.from(e3).join(".")], [7, (e3) => Array.from(e3).join(":")]]);
+ var We = class extends re2 {
+ static canHandle(e3, t2) {
+ return 225 === e3.getUint8(t2 + 1) && 1752462448 === e3.getUint32(t2 + 4) && "http://ns.adobe.com/" === e3.getString(t2 + 4, "http://ns.adobe.com/".length);
+ }
+ static headerLength(e3, t2) {
+ return "http://ns.adobe.com/xmp/extension/" === e3.getString(t2 + 4, "http://ns.adobe.com/xmp/extension/".length) ? 79 : 4 + "http://ns.adobe.com/xap/1.0/".length + 1;
+ }
+ static findPosition(e3, t2) {
+ let i3 = super.findPosition(e3, t2);
+ return i3.multiSegment = i3.extended = 79 === i3.headerLength, i3.multiSegment ? (i3.chunkCount = e3.getUint8(t2 + 72), i3.chunkNumber = e3.getUint8(t2 + 76), 0 !== e3.getUint8(t2 + 77) && i3.chunkNumber++) : (i3.chunkCount = 1 / 0, i3.chunkNumber = -1), i3;
+ }
+ static handleMultiSegments(e3) {
+ return e3.map((e4) => e4.chunk.getString()).join("");
+ }
+ normalizeInput(e3) {
+ return "string" == typeof e3 ? e3 : I.from(e3).getString();
+ }
+ parse(e3 = this.chunk) {
+ if (!this.localOptions.parse) return e3;
+ e3 = function(e4) {
+ let t3 = {}, i4 = {};
+ for (let e6 of Ze) t3[e6] = [], i4[e6] = 0;
+ return e4.replace(et, (e6, n4, s2) => {
+ if ("<" === n4) {
+ let n5 = ++i4[s2];
+ return t3[s2].push(n5), "".concat(e6, "#").concat(n5);
+ }
+ return "".concat(e6, "#").concat(t3[s2].pop());
});
+ }(e3);
+ let t2 = Xe.findAll(e3, "rdf", "Description");
+ 0 === t2.length && t2.push(new Xe("rdf", "Description", void 0, e3));
+ let i3, n3 = {};
+ for (let e4 of t2) for (let t3 of e4.properties) i3 = Je(t3.ns, n3), _e(t3, i3);
+ return function(e4) {
+ let t3;
+ for (let i4 in e4) t3 = e4[i4] = f(e4[i4]), void 0 === t3 && delete e4[i4];
+ return f(e4);
+ }(n3);
+ }
+ assignToOutput(e3, t2) {
+ if (this.localOptions.parse) for (let [i3, n3] of Object.entries(t2)) switch (i3) {
+ case "tiff":
+ this.assignObjectToOutput(e3, "ifd0", n3);
+ break;
+ case "exif":
+ this.assignObjectToOutput(e3, "exif", n3);
+ break;
+ case "xmlns":
+ break;
+ default:
+ this.assignObjectToOutput(e3, i3, n3);
}
- return images;
+ else e3.xmp = t2;
}
- function filterSequences(sequences) {
- var fromDate = context.photos().fromDate();
- var toDate = context.photos().toDate();
- var usernames = context.photos().usernames();
- if (fromDate) {
- var fromTimestamp = new Date(fromDate).getTime();
- sequences = sequences.filter(function(image) {
- return new Date(image.properties.captured_at).getTime() >= fromTimestamp;
- });
+ };
+ c(We, "type", "xmp"), c(We, "multiSegment", true), T.set("xmp", We);
+ var Ke = class _Ke {
+ static findAll(e3) {
+ return qe(e3, /([a-zA-Z0-9-]+):([a-zA-Z0-9-]+)=("[^"]*"|'[^']*')/gm).map(_Ke.unpackMatch);
+ }
+ static unpackMatch(e3) {
+ let t2 = e3[1], i3 = e3[2], n3 = e3[3].slice(1, -1);
+ return n3 = Qe(n3), new _Ke(t2, i3, n3);
+ }
+ constructor(e3, t2, i3) {
+ this.ns = e3, this.name = t2, this.value = i3;
+ }
+ serialize() {
+ return this.value;
+ }
+ };
+ var Xe = class _Xe {
+ static findAll(e3, t2, i3) {
+ if (void 0 !== t2 || void 0 !== i3) {
+ t2 = t2 || "[\\w\\d-]+", i3 = i3 || "[\\w\\d-]+";
+ var n3 = new RegExp("<(".concat(t2, "):(").concat(i3, ")(#\\d+)?((\\s+?[\\w\\d-:]+=(\"[^\"]*\"|'[^']*'))*\\s*)(\\/>|>([\\s\\S]*?)<\\/\\1:\\2\\3>)"), "gm");
+ } else n3 = /<([\w\d-]+):([\w\d-]+)(#\d+)?((\s+?[\w\d-:]+=("[^"]*"|'[^']*'))*\s*)(\/>|>([\s\S]*?)<\/\1:\2\3>)/gm;
+ return qe(e3, n3).map(_Xe.unpackMatch);
+ }
+ static unpackMatch(e3) {
+ let t2 = e3[1], i3 = e3[2], n3 = e3[4], s2 = e3[8];
+ return new _Xe(t2, i3, n3, s2);
+ }
+ constructor(e3, t2, i3, n3) {
+ this.ns = e3, this.name = t2, this.attrString = i3, this.innerXml = n3, this.attrs = Ke.findAll(i3), this.children = _Xe.findAll(n3), this.value = 0 === this.children.length ? Qe(n3) : void 0, this.properties = [...this.attrs, ...this.children];
+ }
+ get isPrimitive() {
+ return void 0 !== this.value && 0 === this.attrs.length && 0 === this.children.length;
+ }
+ get isListContainer() {
+ return 1 === this.children.length && this.children[0].isList;
+ }
+ get isList() {
+ let { ns: e3, name: t2 } = this;
+ return "rdf" === e3 && ("Seq" === t2 || "Bag" === t2 || "Alt" === t2);
+ }
+ get isListItem() {
+ return "rdf" === this.ns && "li" === this.name;
+ }
+ serialize() {
+ if (0 === this.properties.length && void 0 === this.value) return;
+ if (this.isPrimitive) return this.value;
+ if (this.isListContainer) return this.children[0].serialize();
+ if (this.isList) return $e(this.children.map(Ye));
+ if (this.isListItem && 1 === this.children.length && 0 === this.attrs.length) return this.children[0].serialize();
+ let e3 = {};
+ for (let t2 of this.properties) _e(t2, e3);
+ return void 0 !== this.value && (e3.value = this.value), f(e3);
+ }
+ };
+ function _e(e3, t2) {
+ let i3 = e3.serialize();
+ void 0 !== i3 && (t2[e3.name] = i3);
+ }
+ var Ye = (e3) => e3.serialize();
+ var $e = (e3) => 1 === e3.length ? e3[0] : e3;
+ var Je = (e3, t2) => t2[e3] ? t2[e3] : t2[e3] = {};
+ function qe(e3, t2) {
+ let i3, n3 = [];
+ if (!e3) return n3;
+ for (; null !== (i3 = t2.exec(e3)); ) n3.push(i3);
+ return n3;
+ }
+ function Qe(e3) {
+ if (function(e4) {
+ return null == e4 || "null" === e4 || "undefined" === e4 || "" === e4 || "" === e4.trim();
+ }(e3)) return;
+ let t2 = Number(e3);
+ if (!Number.isNaN(t2)) return t2;
+ let i3 = e3.toLowerCase();
+ return "true" === i3 || "false" !== i3 && e3.trim();
+ }
+ var Ze = ["rdf:li", "rdf:Seq", "rdf:Bag", "rdf:Alt", "rdf:Description"];
+ var et = new RegExp("(<|\\/)(".concat(Ze.join("|"), ")"), "g");
+ var tt = Object.freeze({ __proto__: null, default: Me, Exifr: te, fileParsers: w, segmentParsers: T, fileReaders: A, tagKeys: E, tagValues: B, tagRevivers: N, createDictionary: U, extendDictionary: F, fetchUrlAsArrayBuffer: M, readBlobAsArrayBuffer: R, chunkedProps: G, otherSegments: V, segments: z, tiffBlocks: H, segmentsAndBlocks: j, tiffExtractables: W, inheritables: K, allFormatters: X, Options: q, parse: ie, gpsOnlyOptions: me, gps: Se, thumbnailOnlyOptions: Ce, thumbnail: ye, thumbnailUrl: be, orientationOnlyOptions: Ie, orientation: Pe, rotations: ke, get rotateCanvas() {
+ return we;
+ }, get rotateCss() {
+ return Te;
+ }, rotation: Ae });
+ var at = l("fs", (e3) => e3.promises);
+ A.set("fs", class extends ve {
+ async readWhole() {
+ this.chunked = false, this.fs = await at;
+ let e3 = await this.fs.readFile(this.input);
+ this._swapBuffer(e3);
+ }
+ async readChunked() {
+ this.chunked = true, this.fs = await at, await this.open(), await this.readChunk(0, this.options.firstChunkSize);
+ }
+ async open() {
+ void 0 === this.fh && (this.fh = await this.fs.open(this.input, "r"), this.size = (await this.fh.stat(this.input)).size);
+ }
+ async _readChunk(e3, t2) {
+ void 0 === this.fh && await this.open(), e3 + t2 > this.size && (t2 = this.size - e3);
+ var i3 = this.subarray(e3, t2, true);
+ return await this.fh.read(i3.dataView, 0, t2, e3), i3;
+ }
+ async close() {
+ if (this.fh) {
+ let e3 = this.fh;
+ this.fh = void 0, await e3.close();
}
- if (toDate) {
- var toTimestamp = new Date(toDate).getTime();
- sequences = sequences.filter(function(image) {
- return new Date(image.properties.captured_at).getTime() <= toTimestamp;
- });
+ }
+ });
+ A.set("base64", class extends ve {
+ constructor(...e3) {
+ super(...e3), this.input = this.input.replace(/^data:([^;]+);base64,/gim, ""), this.size = this.input.length / 4 * 3, this.input.endsWith("==") ? this.size -= 2 : this.input.endsWith("=") && (this.size -= 1);
+ }
+ async _readChunk(e3, t2) {
+ let i3, n3, r2 = this.input;
+ void 0 === e3 ? (e3 = 0, i3 = 0, n3 = 0) : (i3 = 4 * Math.floor(e3 / 3), n3 = e3 - i3 / 4 * 3), void 0 === t2 && (t2 = this.size);
+ let o2 = e3 + t2, l2 = i3 + 4 * Math.ceil(o2 / 3);
+ r2 = r2.slice(i3, l2);
+ let h2 = Math.min(t2, this.size - e3);
+ if (a) {
+ let t3 = s.from(r2, "base64").slice(n3, n3 + h2);
+ return this.set(t3, e3, true);
}
- if (usernames) {
- sequences = sequences.filter(function(image) {
- return usernames.indexOf(image.properties.captured_by) !== -1;
- });
+ {
+ let t3 = this.subarray(e3, h2, true), i4 = atob(r2), s2 = t3.toUint8();
+ for (let e4 = 0; e4 < h2; e4++) s2[e4] = i4.charCodeAt(n3 + e4);
+ return t3;
}
- return sequences;
}
- function update() {
- var viewer = context.container().select(".photoviewer");
- var selected = viewer.empty() ? void 0 : viewer.datum();
- var z = ~~context.map().zoom();
- var showMarkers = z >= minMarkerZoom;
- var showViewfields = z >= minViewfieldZoom;
- var service = getService();
- var sequences = [];
- var images = [];
- if (context.photos().showsFlat()) {
- sequences = service ? service.sequences(projection2) : [];
- images = service && showMarkers ? service.images(projection2) : [];
- sequences = filterSequences(sequences);
- images = filterImages(images);
- }
- var traces = layer.selectAll(".sequences").selectAll(".sequence").data(sequences, function(d) {
- return d.properties.key;
- });
- traces.exit().remove();
- traces = traces.enter().append("path").attr("class", "sequence").merge(traces).attr("d", svgPath(projection2).geojson);
- var groups = layer.selectAll(".markers").selectAll(".viewfield-group").data(images, function(d) {
- return d.key;
- });
- groups.exit().remove();
- var groupsEnter = groups.enter().append("g").attr("class", "viewfield-group").on("mouseenter", mouseover).on("mouseleave", mouseout).on("click", click);
- groupsEnter.append("g").attr("class", "viewfield-scale");
- var markers = groups.merge(groupsEnter).sort(function(a, b) {
- return a === selected ? 1 : b === selected ? -1 : b.loc[1] - a.loc[1];
- }).attr("transform", transform2).select(".viewfield-scale");
- markers.selectAll("circle").data([0]).enter().append("circle").attr("dx", "0").attr("dy", "0").attr("r", "6");
- var viewfields = markers.selectAll(".viewfield").data(showViewfields ? [0] : []);
- viewfields.exit().remove();
- viewfields.enter().insert("path", "circle").attr("class", "viewfield").attr("transform", "scale(1.5,1.5),translate(-8, -13)").attr("d", "M 6,9 C 8,8.4 8,8.4 10,9 L 16,-2 C 12,-5 4,-5 0,-2 z");
+ });
+ var ot = class extends se {
+ static canHandle(e3, t2) {
+ return 18761 === t2 || 19789 === t2;
}
- function drawImages(selection2) {
- var enabled = svgKartaviewImages.enabled, service = getService();
- layer = selection2.selectAll(".layer-kartaview").data(service ? [0] : []);
- layer.exit().remove();
- var layerEnter = layer.enter().append("g").attr("class", "layer-kartaview").style("display", enabled ? "block" : "none");
- layerEnter.append("g").attr("class", "sequences");
- layerEnter.append("g").attr("class", "markers");
- layer = layerEnter.merge(layer);
- if (enabled) {
- if (service && ~~context.map().zoom() >= minZoom3) {
- editOn();
- update();
- service.loadImages(projection2);
- } else {
- editOff();
- }
+ extendOptions(e3) {
+ let { ifd0: t2, xmp: i3, iptc: n3, icc: s2 } = e3;
+ i3.enabled && t2.deps.add(700), n3.enabled && t2.deps.add(33723), s2.enabled && t2.deps.add(34675), t2.finalizeFilters();
+ }
+ async parse() {
+ let { tiff: e3, xmp: t2, iptc: i3, icc: n3 } = this.options;
+ if (e3.enabled || t2.enabled || i3.enabled || n3.enabled) {
+ let e4 = Math.max(S(this.options), this.options.chunkSize);
+ await this.file.ensureChunk(0, e4), this.createParser("tiff", this.file), this.parsers.tiff.parseHeader(), await this.parsers.tiff.parseIfd0Block(), this.adaptTiffPropAsSegment("xmp"), this.adaptTiffPropAsSegment("iptc"), this.adaptTiffPropAsSegment("icc");
}
}
- drawImages.enabled = function(_) {
- if (!arguments.length)
- return svgKartaviewImages.enabled;
- svgKartaviewImages.enabled = _;
- if (svgKartaviewImages.enabled) {
- showLayer();
- context.photos().on("change.kartaview_images", update);
- } else {
- hideLayer();
- context.photos().on("change.kartaview_images", null);
+ adaptTiffPropAsSegment(e3) {
+ if (this.parsers.tiff[e3]) {
+ let t2 = this.parsers.tiff[e3];
+ this.injectSegment(e3, t2);
}
- dispatch10.call("change");
- return this;
- };
- drawImages.supported = function() {
- return !!getService();
- };
- init2();
- return drawImages;
- }
-
- // modules/svg/osm.js
- function svgOsm(projection2, context, dispatch10) {
- var enabled = true;
- function drawOsm(selection2) {
- selection2.selectAll(".layer-osm").data(["covered", "areas", "lines", "points", "labels"]).enter().append("g").attr("class", function(d) {
- return "layer-osm " + d;
- });
- selection2.selectAll(".layer-osm.points").selectAll(".points-group").data(["points", "midpoints", "vertices", "turns"]).enter().append("g").attr("class", function(d) {
- return "points-group " + d;
- });
}
- function showLayer() {
- var layer = context.surface().selectAll(".data-layer.osm");
- layer.interrupt();
- layer.classed("disabled", false).style("opacity", 0).transition().duration(250).style("opacity", 1).on("end interrupt", function() {
- dispatch10.call("change");
- });
+ };
+ c(ot, "type", "tiff"), w.set("tiff", ot);
+ var lt = l("zlib");
+ var ht = ["ihdr", "iccp", "text", "itxt", "exif"];
+ var ut = class extends se {
+ constructor(...e3) {
+ super(...e3), c(this, "catchError", (e4) => this.errors.push(e4)), c(this, "metaChunks", []), c(this, "unknownChunks", []);
}
- function hideLayer() {
- var layer = context.surface().selectAll(".data-layer.osm");
- layer.interrupt();
- layer.transition().duration(250).style("opacity", 0).on("end interrupt", function() {
- layer.classed("disabled", true);
- dispatch10.call("change");
- });
+ static canHandle(e3, t2) {
+ return 35152 === t2 && 2303741511 === e3.getUint32(0) && 218765834 === e3.getUint32(4);
}
- drawOsm.enabled = function(val) {
- if (!arguments.length)
- return enabled;
- enabled = val;
- if (enabled) {
- showLayer();
- } else {
- hideLayer();
- }
- dispatch10.call("change");
- return this;
- };
- return drawOsm;
- }
-
- // modules/svg/notes.js
- var _notesEnabled = false;
- var _osmService;
- function svgNotes(projection2, context, dispatch10) {
- if (!dispatch10) {
- dispatch10 = dispatch_default("change");
+ async parse() {
+ let { file: e3 } = this;
+ await this.findPngChunksInRange("\x89PNG\r\n\n".length, e3.byteLength), await this.readSegments(this.metaChunks), this.findIhdr(), this.parseTextChunks(), await this.findExif().catch(this.catchError), await this.findXmp().catch(this.catchError), await this.findIcc().catch(this.catchError);
}
- var throttledRedraw = throttle_default(function() {
- dispatch10.call("change");
- }, 1e3);
- var minZoom3 = 12;
- var touchLayer = select_default2(null);
- var drawLayer = select_default2(null);
- var _notesVisible = false;
- function markerPath(selection2, klass) {
- selection2.attr("class", klass).attr("transform", "translate(-8, -22)").attr("d", "m17.5,0l-15,0c-1.37,0 -2.5,1.12 -2.5,2.5l0,11.25c0,1.37 1.12,2.5 2.5,2.5l3.75,0l0,3.28c0,0.38 0.43,0.6 0.75,0.37l4.87,-3.65l5.62,0c1.37,0 2.5,-1.12 2.5,-2.5l0,-11.25c0,-1.37 -1.12,-2.5 -2.5,-2.5z");
+ async findPngChunksInRange(e3, t2) {
+ let { file: i3 } = this;
+ for (; e3 < t2; ) {
+ let t3 = i3.getUint32(e3), n3 = i3.getUint32(e3 + 4), s2 = i3.getString(e3 + 4, 4).toLowerCase(), r2 = t3 + 4 + 4 + 4, a2 = { type: s2, offset: e3, length: r2, start: e3 + 4 + 4, size: t3, marker: n3 };
+ ht.includes(s2) ? this.metaChunks.push(a2) : this.unknownChunks.push(a2), e3 += r2;
+ }
}
- function getService() {
- if (services.osm && !_osmService) {
- _osmService = services.osm;
- _osmService.on("loadedNotes", throttledRedraw);
- } else if (!services.osm && _osmService) {
- _osmService = null;
+ parseTextChunks() {
+ let e3 = this.metaChunks.filter((e4) => "text" === e4.type);
+ for (let t2 of e3) {
+ let [e4, i3] = this.file.getString(t2.start, t2.size).split("\0");
+ this.injectKeyValToIhdr(e4, i3);
}
- return _osmService;
}
- function editOn() {
- if (!_notesVisible) {
- _notesVisible = true;
- drawLayer.style("display", "block");
+ injectKeyValToIhdr(e3, t2) {
+ let i3 = this.parsers.ihdr;
+ i3 && i3.raw.set(e3, t2);
+ }
+ findIhdr() {
+ let e3 = this.metaChunks.find((e4) => "ihdr" === e4.type);
+ e3 && false !== this.options.ihdr.enabled && this.createParser("ihdr", e3.chunk);
+ }
+ async findExif() {
+ let e3 = this.metaChunks.find((e4) => "exif" === e4.type);
+ e3 && this.injectSegment("tiff", e3.chunk);
+ }
+ async findXmp() {
+ let e3 = this.metaChunks.filter((e4) => "itxt" === e4.type);
+ for (let t2 of e3) {
+ "XML:com.adobe.xmp" === t2.chunk.getString(0, "XML:com.adobe.xmp".length) && this.injectSegment("xmp", t2.chunk);
}
}
- function editOff() {
- if (_notesVisible) {
- _notesVisible = false;
- drawLayer.style("display", "none");
- drawLayer.selectAll(".note").remove();
- touchLayer.selectAll(".note").remove();
+ async findIcc() {
+ let e3 = this.metaChunks.find((e4) => "iccp" === e4.type);
+ if (!e3) return;
+ let { chunk: t2 } = e3, i3 = t2.getUint8Array(0, 81), s2 = 0;
+ for (; s2 < 80 && 0 !== i3[s2]; ) s2++;
+ let r2 = s2 + 2, a2 = t2.getString(0, s2);
+ if (this.injectKeyValToIhdr("ProfileName", a2), n2) {
+ let e4 = await lt, i4 = t2.getUint8Array(r2);
+ i4 = e4.inflateSync(i4), this.injectSegment("icc", i4);
}
}
- function layerOn() {
- editOn();
- drawLayer.style("opacity", 0).transition().duration(250).style("opacity", 1).on("end interrupt", function() {
- dispatch10.call("change");
- });
+ };
+ c(ut, "type", "png"), w.set("png", ut), U(E, "interop", [[1, "InteropIndex"], [2, "InteropVersion"], [4096, "RelatedImageFileFormat"], [4097, "RelatedImageWidth"], [4098, "RelatedImageHeight"]]), F(E, "ifd0", [[11, "ProcessingSoftware"], [254, "SubfileType"], [255, "OldSubfileType"], [263, "Thresholding"], [264, "CellWidth"], [265, "CellLength"], [266, "FillOrder"], [269, "DocumentName"], [280, "MinSampleValue"], [281, "MaxSampleValue"], [285, "PageName"], [286, "XPosition"], [287, "YPosition"], [290, "GrayResponseUnit"], [297, "PageNumber"], [321, "HalftoneHints"], [322, "TileWidth"], [323, "TileLength"], [332, "InkSet"], [337, "TargetPrinter"], [18246, "Rating"], [18249, "RatingPercent"], [33550, "PixelScale"], [34264, "ModelTransform"], [34377, "PhotoshopSettings"], [50706, "DNGVersion"], [50707, "DNGBackwardVersion"], [50708, "UniqueCameraModel"], [50709, "LocalizedCameraModel"], [50736, "DNGLensInfo"], [50739, "ShadowScale"], [50740, "DNGPrivateData"], [33920, "IntergraphMatrix"], [33922, "ModelTiePoint"], [34118, "SEMInfo"], [34735, "GeoTiffDirectory"], [34736, "GeoTiffDoubleParams"], [34737, "GeoTiffAsciiParams"], [50341, "PrintIM"], [50721, "ColorMatrix1"], [50722, "ColorMatrix2"], [50723, "CameraCalibration1"], [50724, "CameraCalibration2"], [50725, "ReductionMatrix1"], [50726, "ReductionMatrix2"], [50727, "AnalogBalance"], [50728, "AsShotNeutral"], [50729, "AsShotWhiteXY"], [50730, "BaselineExposure"], [50731, "BaselineNoise"], [50732, "BaselineSharpness"], [50734, "LinearResponseLimit"], [50735, "CameraSerialNumber"], [50741, "MakerNoteSafety"], [50778, "CalibrationIlluminant1"], [50779, "CalibrationIlluminant2"], [50781, "RawDataUniqueID"], [50827, "OriginalRawFileName"], [50828, "OriginalRawFileData"], [50831, "AsShotICCProfile"], [50832, "AsShotPreProfileMatrix"], [50833, "CurrentICCProfile"], [50834, "CurrentPreProfileMatrix"], [50879, "ColorimetricReference"], [50885, "SRawType"], [50898, "PanasonicTitle"], [50899, "PanasonicTitle2"], [50931, "CameraCalibrationSig"], [50932, "ProfileCalibrationSig"], [50933, "ProfileIFD"], [50934, "AsShotProfileName"], [50936, "ProfileName"], [50937, "ProfileHueSatMapDims"], [50938, "ProfileHueSatMapData1"], [50939, "ProfileHueSatMapData2"], [50940, "ProfileToneCurve"], [50941, "ProfileEmbedPolicy"], [50942, "ProfileCopyright"], [50964, "ForwardMatrix1"], [50965, "ForwardMatrix2"], [50966, "PreviewApplicationName"], [50967, "PreviewApplicationVersion"], [50968, "PreviewSettingsName"], [50969, "PreviewSettingsDigest"], [50970, "PreviewColorSpace"], [50971, "PreviewDateTime"], [50972, "RawImageDigest"], [50973, "OriginalRawFileDigest"], [50981, "ProfileLookTableDims"], [50982, "ProfileLookTableData"], [51043, "TimeCodes"], [51044, "FrameRate"], [51058, "TStop"], [51081, "ReelName"], [51089, "OriginalDefaultFinalSize"], [51090, "OriginalBestQualitySize"], [51091, "OriginalDefaultCropSize"], [51105, "CameraLabel"], [51107, "ProfileHueSatMapEncoding"], [51108, "ProfileLookTableEncoding"], [51109, "BaselineExposureOffset"], [51110, "DefaultBlackRender"], [51111, "NewRawImageDigest"], [51112, "RawToPreviewGain"]]);
+ var ct = [[273, "StripOffsets"], [279, "StripByteCounts"], [288, "FreeOffsets"], [289, "FreeByteCounts"], [291, "GrayResponseCurve"], [292, "T4Options"], [293, "T6Options"], [300, "ColorResponseUnit"], [320, "ColorMap"], [324, "TileOffsets"], [325, "TileByteCounts"], [326, "BadFaxLines"], [327, "CleanFaxData"], [328, "ConsecutiveBadFaxLines"], [330, "SubIFD"], [333, "InkNames"], [334, "NumberofInks"], [336, "DotRange"], [338, "ExtraSamples"], [339, "SampleFormat"], [340, "SMinSampleValue"], [341, "SMaxSampleValue"], [342, "TransferRange"], [343, "ClipPath"], [344, "XClipPathUnits"], [345, "YClipPathUnits"], [346, "Indexed"], [347, "JPEGTables"], [351, "OPIProxy"], [400, "GlobalParametersIFD"], [401, "ProfileType"], [402, "FaxProfile"], [403, "CodingMethods"], [404, "VersionYear"], [405, "ModeNumber"], [433, "Decode"], [434, "DefaultImageColor"], [435, "T82Options"], [437, "JPEGTables"], [512, "JPEGProc"], [515, "JPEGRestartInterval"], [517, "JPEGLosslessPredictors"], [518, "JPEGPointTransforms"], [519, "JPEGQTables"], [520, "JPEGDCTables"], [521, "JPEGACTables"], [559, "StripRowCounts"], [999, "USPTOMiscellaneous"], [18247, "XP_DIP_XML"], [18248, "StitchInfo"], [28672, "SonyRawFileType"], [28688, "SonyToneCurve"], [28721, "VignettingCorrection"], [28722, "VignettingCorrParams"], [28724, "ChromaticAberrationCorrection"], [28725, "ChromaticAberrationCorrParams"], [28726, "DistortionCorrection"], [28727, "DistortionCorrParams"], [29895, "SonyCropTopLeft"], [29896, "SonyCropSize"], [32781, "ImageID"], [32931, "WangTag1"], [32932, "WangAnnotation"], [32933, "WangTag3"], [32934, "WangTag4"], [32953, "ImageReferencePoints"], [32954, "RegionXformTackPoint"], [32955, "WarpQuadrilateral"], [32956, "AffineTransformMat"], [32995, "Matteing"], [32996, "DataType"], [32997, "ImageDepth"], [32998, "TileDepth"], [33300, "ImageFullWidth"], [33301, "ImageFullHeight"], [33302, "TextureFormat"], [33303, "WrapModes"], [33304, "FovCot"], [33305, "MatrixWorldToScreen"], [33306, "MatrixWorldToCamera"], [33405, "Model2"], [33421, "CFARepeatPatternDim"], [33422, "CFAPattern2"], [33423, "BatteryLevel"], [33424, "KodakIFD"], [33445, "MDFileTag"], [33446, "MDScalePixel"], [33447, "MDColorTable"], [33448, "MDLabName"], [33449, "MDSampleInfo"], [33450, "MDPrepDate"], [33451, "MDPrepTime"], [33452, "MDFileUnits"], [33589, "AdventScale"], [33590, "AdventRevision"], [33628, "UIC1Tag"], [33629, "UIC2Tag"], [33630, "UIC3Tag"], [33631, "UIC4Tag"], [33918, "IntergraphPacketData"], [33919, "IntergraphFlagRegisters"], [33921, "INGRReserved"], [34016, "Site"], [34017, "ColorSequence"], [34018, "IT8Header"], [34019, "RasterPadding"], [34020, "BitsPerRunLength"], [34021, "BitsPerExtendedRunLength"], [34022, "ColorTable"], [34023, "ImageColorIndicator"], [34024, "BackgroundColorIndicator"], [34025, "ImageColorValue"], [34026, "BackgroundColorValue"], [34027, "PixelIntensityRange"], [34028, "TransparencyIndicator"], [34029, "ColorCharacterization"], [34030, "HCUsage"], [34031, "TrapIndicator"], [34032, "CMYKEquivalent"], [34152, "AFCP_IPTC"], [34232, "PixelMagicJBIGOptions"], [34263, "JPLCartoIFD"], [34306, "WB_GRGBLevels"], [34310, "LeafData"], [34687, "TIFF_FXExtensions"], [34688, "MultiProfiles"], [34689, "SharedData"], [34690, "T88Options"], [34732, "ImageLayer"], [34750, "JBIGOptions"], [34856, "Opto-ElectricConvFactor"], [34857, "Interlace"], [34908, "FaxRecvParams"], [34909, "FaxSubAddress"], [34910, "FaxRecvTime"], [34929, "FedexEDR"], [34954, "LeafSubIFD"], [37387, "FlashEnergy"], [37388, "SpatialFrequencyResponse"], [37389, "Noise"], [37390, "FocalPlaneXResolution"], [37391, "FocalPlaneYResolution"], [37392, "FocalPlaneResolutionUnit"], [37397, "ExposureIndex"], [37398, "TIFF-EPStandardID"], [37399, "SensingMethod"], [37434, "CIP3DataFile"], [37435, "CIP3Sheet"], [37436, "CIP3Side"], [37439, "StoNits"], [37679, "MSDocumentText"], [37680, "MSPropertySetStorage"], [37681, "MSDocumentTextPosition"], [37724, "ImageSourceData"], [40965, "InteropIFD"], [40976, "SamsungRawPointersOffset"], [40977, "SamsungRawPointersLength"], [41217, "SamsungRawByteOrder"], [41218, "SamsungRawUnknown"], [41484, "SpatialFrequencyResponse"], [41485, "Noise"], [41489, "ImageNumber"], [41490, "SecurityClassification"], [41491, "ImageHistory"], [41494, "TIFF-EPStandardID"], [41995, "DeviceSettingDescription"], [42112, "GDALMetadata"], [42113, "GDALNoData"], [44992, "ExpandSoftware"], [44993, "ExpandLens"], [44994, "ExpandFilm"], [44995, "ExpandFilterLens"], [44996, "ExpandScanner"], [44997, "ExpandFlashLamp"], [46275, "HasselbladRawImage"], [48129, "PixelFormat"], [48130, "Transformation"], [48131, "Uncompressed"], [48132, "ImageType"], [48256, "ImageWidth"], [48257, "ImageHeight"], [48258, "WidthResolution"], [48259, "HeightResolution"], [48320, "ImageOffset"], [48321, "ImageByteCount"], [48322, "AlphaOffset"], [48323, "AlphaByteCount"], [48324, "ImageDataDiscard"], [48325, "AlphaDataDiscard"], [50215, "OceScanjobDesc"], [50216, "OceApplicationSelector"], [50217, "OceIDNumber"], [50218, "OceImageLogic"], [50255, "Annotations"], [50459, "HasselbladExif"], [50547, "OriginalFileName"], [50560, "USPTOOriginalContentType"], [50656, "CR2CFAPattern"], [50710, "CFAPlaneColor"], [50711, "CFALayout"], [50712, "LinearizationTable"], [50713, "BlackLevelRepeatDim"], [50714, "BlackLevel"], [50715, "BlackLevelDeltaH"], [50716, "BlackLevelDeltaV"], [50717, "WhiteLevel"], [50718, "DefaultScale"], [50719, "DefaultCropOrigin"], [50720, "DefaultCropSize"], [50733, "BayerGreenSplit"], [50737, "ChromaBlurRadius"], [50738, "AntiAliasStrength"], [50752, "RawImageSegmentation"], [50780, "BestQualityScale"], [50784, "AliasLayerMetadata"], [50829, "ActiveArea"], [50830, "MaskedAreas"], [50935, "NoiseReductionApplied"], [50974, "SubTileBlockSize"], [50975, "RowInterleaveFactor"], [51008, "OpcodeList1"], [51009, "OpcodeList2"], [51022, "OpcodeList3"], [51041, "NoiseProfile"], [51114, "CacheVersion"], [51125, "DefaultUserCrop"], [51157, "NikonNEFInfo"], [65024, "KdcIFD"]];
+ F(E, "ifd0", ct), F(E, "exif", ct), U(B, "gps", [[23, { M: "Magnetic North", T: "True North" }], [25, { K: "Kilometers", M: "Miles", N: "Nautical Miles" }]]);
+ var ft = class extends re2 {
+ static canHandle(e3, t2) {
+ return 224 === e3.getUint8(t2 + 1) && 1246120262 === e3.getUint32(t2 + 4) && 0 === e3.getUint8(t2 + 8);
}
- function layerOff() {
- throttledRedraw.cancel();
- drawLayer.interrupt();
- touchLayer.selectAll(".note").remove();
- drawLayer.transition().duration(250).style("opacity", 0).on("end interrupt", function() {
- editOff();
- dispatch10.call("change");
- });
+ parse() {
+ return this.parseTags(), this.translate(), this.output;
}
- function updateMarkers() {
- if (!_notesVisible || !_notesEnabled)
- return;
- var service = getService();
- var selectedID = context.selectedNoteID();
- var data = service ? service.notes(projection2) : [];
- var getTransform = svgPointTransform(projection2);
- var notes = drawLayer.selectAll(".note").data(data, function(d) {
- return d.status + d.id;
- });
- notes.exit().remove();
- var notesEnter = notes.enter().append("g").attr("class", function(d) {
- return "note note-" + d.id + " " + d.status;
- }).classed("new", function(d) {
- return d.id < 0;
- });
- notesEnter.append("ellipse").attr("cx", 0.5).attr("cy", 1).attr("rx", 6.5).attr("ry", 3).attr("class", "stroke");
- notesEnter.append("path").call(markerPath, "shadow");
- notesEnter.append("use").attr("class", "note-fill").attr("width", "20px").attr("height", "20px").attr("x", "-8px").attr("y", "-22px").attr("xlink:href", "#iD-icon-note");
- notesEnter.selectAll(".icon-annotation").data(function(d) {
- return [d];
- }).enter().append("use").attr("class", "icon-annotation").attr("width", "10px").attr("height", "10px").attr("x", "-3px").attr("y", "-19px").attr("xlink:href", function(d) {
- if (d.id < 0)
- return "#iD-icon-plus";
- if (d.status === "open")
- return "#iD-icon-close";
- return "#iD-icon-apply";
- });
- notes.merge(notesEnter).sort(sortY).classed("selected", function(d) {
- var mode = context.mode();
- var isMoving = mode && mode.id === "drag-note";
- return !isMoving && d.id === selectedID;
- }).attr("transform", getTransform);
- if (touchLayer.empty())
- return;
- var fillClass = context.getDebug("target") ? "pink " : "nocolor ";
- var targets = touchLayer.selectAll(".note").data(data, function(d) {
- return d.id;
- });
- targets.exit().remove();
- targets.enter().append("rect").attr("width", "20px").attr("height", "20px").attr("x", "-8px").attr("y", "-22px").merge(targets).sort(sortY).attr("class", function(d) {
- var newClass = d.id < 0 ? "new" : "";
- return "note target note-" + d.id + " " + fillClass + newClass;
- }).attr("transform", getTransform);
- function sortY(a, b) {
- if (a.id === selectedID)
- return 1;
- if (b.id === selectedID)
- return -1;
- return b.loc[1] - a.loc[1];
- }
+ parseTags() {
+ this.raw = /* @__PURE__ */ new Map([[0, this.chunk.getUint16(0)], [2, this.chunk.getUint8(2)], [3, this.chunk.getUint16(3)], [5, this.chunk.getUint16(5)], [7, this.chunk.getUint8(7)], [8, this.chunk.getUint8(8)]]);
}
- function drawNotes(selection2) {
- var service = getService();
- var surface = context.surface();
- if (surface && !surface.empty()) {
- touchLayer = surface.selectAll(".data-layer.touch .layer-touch.markers");
+ };
+ c(ft, "type", "jfif"), c(ft, "headerLength", 9), T.set("jfif", ft), U(E, "jfif", [[0, "JFIFVersion"], [2, "ResolutionUnit"], [3, "XResolution"], [5, "YResolution"], [7, "ThumbnailWidth"], [8, "ThumbnailHeight"]]);
+ var dt = class extends re2 {
+ parse() {
+ return this.parseTags(), this.translate(), this.output;
+ }
+ parseTags() {
+ this.raw = new Map([[0, this.chunk.getUint32(0)], [4, this.chunk.getUint32(4)], [8, this.chunk.getUint8(8)], [9, this.chunk.getUint8(9)], [10, this.chunk.getUint8(10)], [11, this.chunk.getUint8(11)], [12, this.chunk.getUint8(12)], ...Array.from(this.raw)]);
+ }
+ };
+ c(dt, "type", "ihdr"), T.set("ihdr", dt), U(E, "ihdr", [[0, "ImageWidth"], [4, "ImageHeight"], [8, "BitDepth"], [9, "ColorType"], [10, "Compression"], [11, "Filter"], [12, "Interlace"]]), U(B, "ihdr", [[9, { 0: "Grayscale", 2: "RGB", 3: "Palette", 4: "Grayscale with Alpha", 6: "RGB with Alpha", DEFAULT: "Unknown" }], [10, { 0: "Deflate/Inflate", DEFAULT: "Unknown" }], [11, { 0: "Adaptive", DEFAULT: "Unknown" }], [12, { 0: "Noninterlaced", 1: "Adam7 Interlace", DEFAULT: "Unknown" }]]);
+ var pt = class extends re2 {
+ static canHandle(e3, t2) {
+ return 226 === e3.getUint8(t2 + 1) && 1229144927 === e3.getUint32(t2 + 4);
+ }
+ static findPosition(e3, t2) {
+ let i3 = super.findPosition(e3, t2);
+ return i3.chunkNumber = e3.getUint8(t2 + 16), i3.chunkCount = e3.getUint8(t2 + 17), i3.multiSegment = i3.chunkCount > 1, i3;
+ }
+ static handleMultiSegments(e3) {
+ return function(e4) {
+ let t2 = function(e6) {
+ let t3 = e6[0].constructor, i3 = 0;
+ for (let t4 of e6) i3 += t4.length;
+ let n3 = new t3(i3), s2 = 0;
+ for (let t4 of e6) n3.set(t4, s2), s2 += t4.length;
+ return n3;
+ }(e4.map((e6) => e6.chunk.toUint8()));
+ return new I(t2);
+ }(e3);
+ }
+ parse() {
+ return this.raw = /* @__PURE__ */ new Map(), this.parseHeader(), this.parseTags(), this.translate(), this.output;
+ }
+ parseHeader() {
+ let { raw: e3 } = this;
+ this.chunk.byteLength < 84 && g2("ICC header is too short");
+ for (let [t2, i3] of Object.entries(gt)) {
+ t2 = parseInt(t2, 10);
+ let n3 = i3(this.chunk, t2);
+ "\0\0\0\0" !== n3 && e3.set(t2, n3);
}
- drawLayer = selection2.selectAll(".layer-notes").data(service ? [0] : []);
- drawLayer.exit().remove();
- drawLayer = drawLayer.enter().append("g").attr("class", "layer-notes").style("display", _notesEnabled ? "block" : "none").merge(drawLayer);
- if (_notesEnabled) {
- if (service && ~~context.map().zoom() >= minZoom3) {
- editOn();
- service.loadNotes(projection2);
- updateMarkers();
- } else {
- editOff();
- }
+ }
+ parseTags() {
+ let e3, t2, i3, n3, s2, { raw: r2 } = this, a2 = this.chunk.getUint32(128), o2 = 132, l2 = this.chunk.byteLength;
+ for (; a2--; ) {
+ if (e3 = this.chunk.getString(o2, 4), t2 = this.chunk.getUint32(o2 + 4), i3 = this.chunk.getUint32(o2 + 8), n3 = this.chunk.getString(t2, 4), t2 + i3 > l2) return void console.warn("reached the end of the first ICC chunk. Enable options.tiff.multiSegment to read all ICC segments.");
+ s2 = this.parseTag(n3, t2, i3), void 0 !== s2 && "\0\0\0\0" !== s2 && r2.set(e3, s2), o2 += 12;
}
}
- drawNotes.enabled = function(val) {
- if (!arguments.length)
- return _notesEnabled;
- _notesEnabled = val;
- if (_notesEnabled) {
- layerOn();
- } else {
- layerOff();
- if (context.selectedNoteID()) {
- context.enter(modeBrowse(context));
- }
+ parseTag(e3, t2, i3) {
+ switch (e3) {
+ case "desc":
+ return this.parseDesc(t2);
+ case "mluc":
+ return this.parseMluc(t2);
+ case "text":
+ return this.parseText(t2, i3);
+ case "sig ":
+ return this.parseSig(t2);
}
- dispatch10.call("change");
- return this;
- };
- return drawNotes;
- }
-
- // modules/svg/touch.js
- function svgTouch() {
- function drawTouch(selection2) {
- selection2.selectAll(".layer-touch").data(["areas", "lines", "points", "turns", "markers"]).enter().append("g").attr("class", function(d) {
- return "layer-touch " + d;
- });
+ if (!(t2 + i3 > this.chunk.byteLength)) return this.chunk.getUint8Array(t2, i3);
}
- return drawTouch;
- }
-
- // modules/util/dimensions.js
- function refresh(selection2, node) {
- var cr = node.getBoundingClientRect();
- var prop = [cr.width, cr.height];
- selection2.property("__dimensions__", prop);
- return prop;
- }
- function utilGetDimensions(selection2, force) {
- if (!selection2 || selection2.empty()) {
- return [0, 0];
+ parseDesc(e3) {
+ let t2 = this.chunk.getUint32(e3 + 8) - 1;
+ return m(this.chunk.getString(e3 + 12, t2));
}
- var node = selection2.node(), cached = selection2.property("__dimensions__");
- return !cached || force ? refresh(selection2, node) : cached;
- }
- function utilSetDimensions(selection2, dimensions) {
- if (!selection2 || selection2.empty()) {
- return selection2;
+ parseText(e3, t2) {
+ return m(this.chunk.getString(e3 + 8, t2 - 8));
}
- var node = selection2.node();
- if (dimensions === null) {
- refresh(selection2, node);
- return selection2;
+ parseSig(e3) {
+ return m(this.chunk.getString(e3 + 8, 4));
}
- return selection2.property("__dimensions__", [dimensions[0], dimensions[1]]).attr("width", dimensions[0]).attr("height", dimensions[1]);
- }
-
- // modules/svg/layers.js
- function svgLayers(projection2, context) {
- var dispatch10 = dispatch_default("change");
- var svg2 = select_default2(null);
- var _layers = [
- { id: "osm", layer: svgOsm(projection2, context, dispatch10) },
- { id: "notes", layer: svgNotes(projection2, context, dispatch10) },
- { id: "data", layer: svgData(projection2, context, dispatch10) },
- { id: "keepRight", layer: svgKeepRight(projection2, context, dispatch10) },
- { id: "improveOSM", layer: svgImproveOSM(projection2, context, dispatch10) },
- { id: "osmose", layer: svgOsmose(projection2, context, dispatch10) },
- { id: "streetside", layer: svgStreetside(projection2, context, dispatch10) },
- { id: "mapillary", layer: svgMapillaryImages(projection2, context, dispatch10) },
- { id: "mapillary-position", layer: svgMapillaryPosition(projection2, context, dispatch10) },
- { id: "mapillary-map-features", layer: svgMapillaryMapFeatures(projection2, context, dispatch10) },
- { id: "mapillary-signs", layer: svgMapillarySigns(projection2, context, dispatch10) },
- { id: "kartaview", layer: svgKartaviewImages(projection2, context, dispatch10) },
- { id: "debug", layer: svgDebug(projection2, context, dispatch10) },
- { id: "geolocate", layer: svgGeolocate(projection2, context, dispatch10) },
- { id: "touch", layer: svgTouch(projection2, context, dispatch10) }
- ];
- function drawLayers(selection2) {
- svg2 = selection2.selectAll(".surface").data([0]);
- svg2 = svg2.enter().append("svg").attr("class", "surface").merge(svg2);
- var defs = svg2.selectAll(".surface-defs").data([0]);
- defs.enter().append("defs").attr("class", "surface-defs");
- var groups = svg2.selectAll(".data-layer").data(_layers);
- groups.exit().remove();
- groups.enter().append("g").attr("class", function(d) {
- return "data-layer " + d.id;
- }).merge(groups).each(function(d) {
- select_default2(this).call(d.layer);
- });
+ parseMluc(e3) {
+ let { chunk: t2 } = this, i3 = t2.getUint32(e3 + 8), n3 = t2.getUint32(e3 + 12), s2 = e3 + 16, r2 = [];
+ for (let a2 = 0; a2 < i3; a2++) {
+ let i4 = t2.getString(s2 + 0, 2), a3 = t2.getString(s2 + 2, 2), o2 = t2.getUint32(s2 + 4), l2 = t2.getUint32(s2 + 8) + e3, h2 = m(t2.getUnicodeString(l2, o2));
+ r2.push({ lang: i4, country: a3, text: h2 }), s2 += n3;
+ }
+ return 1 === i3 ? r2[0].text : r2;
}
- drawLayers.all = function() {
- return _layers;
- };
- drawLayers.layer = function(id2) {
- var obj = _layers.find(function(o) {
- return o.id === id2;
- });
- return obj && obj.layer;
- };
- drawLayers.only = function(what) {
- var arr = [].concat(what);
- var all = _layers.map(function(layer) {
- return layer.id;
+ translateValue(e3, t2) {
+ return "string" == typeof e3 ? t2[e3] || t2[e3.toLowerCase()] || e3 : t2[e3] || e3;
+ }
+ };
+ c(pt, "type", "icc"), c(pt, "multiSegment", true), c(pt, "headerLength", 18);
+ var gt = { 4: mt, 8: function(e3, t2) {
+ return [e3.getUint8(t2), e3.getUint8(t2 + 1) >> 4, e3.getUint8(t2 + 1) % 16].map((e4) => e4.toString(10)).join(".");
+ }, 12: mt, 16: mt, 20: mt, 24: function(e3, t2) {
+ const i3 = e3.getUint16(t2), n3 = e3.getUint16(t2 + 2) - 1, s2 = e3.getUint16(t2 + 4), r2 = e3.getUint16(t2 + 6), a2 = e3.getUint16(t2 + 8), o2 = e3.getUint16(t2 + 10);
+ return new Date(Date.UTC(i3, n3, s2, r2, a2, o2));
+ }, 36: mt, 40: mt, 48: mt, 52: mt, 64: (e3, t2) => e3.getUint32(t2), 80: mt };
+ function mt(e3, t2) {
+ return m(e3.getString(t2, 4));
+ }
+ T.set("icc", pt), U(E, "icc", [[4, "ProfileCMMType"], [8, "ProfileVersion"], [12, "ProfileClass"], [16, "ColorSpaceData"], [20, "ProfileConnectionSpace"], [24, "ProfileDateTime"], [36, "ProfileFileSignature"], [40, "PrimaryPlatform"], [44, "CMMFlags"], [48, "DeviceManufacturer"], [52, "DeviceModel"], [56, "DeviceAttributes"], [64, "RenderingIntent"], [68, "ConnectionSpaceIlluminant"], [80, "ProfileCreator"], [84, "ProfileID"], ["Header", "ProfileHeader"], ["MS00", "WCSProfiles"], ["bTRC", "BlueTRC"], ["bXYZ", "BlueMatrixColumn"], ["bfd", "UCRBG"], ["bkpt", "MediaBlackPoint"], ["calt", "CalibrationDateTime"], ["chad", "ChromaticAdaptation"], ["chrm", "Chromaticity"], ["ciis", "ColorimetricIntentImageState"], ["clot", "ColorantTableOut"], ["clro", "ColorantOrder"], ["clrt", "ColorantTable"], ["cprt", "ProfileCopyright"], ["crdi", "CRDInfo"], ["desc", "ProfileDescription"], ["devs", "DeviceSettings"], ["dmdd", "DeviceModelDesc"], ["dmnd", "DeviceMfgDesc"], ["dscm", "ProfileDescriptionML"], ["fpce", "FocalPlaneColorimetryEstimates"], ["gTRC", "GreenTRC"], ["gXYZ", "GreenMatrixColumn"], ["gamt", "Gamut"], ["kTRC", "GrayTRC"], ["lumi", "Luminance"], ["meas", "Measurement"], ["meta", "Metadata"], ["mmod", "MakeAndModel"], ["ncl2", "NamedColor2"], ["ncol", "NamedColor"], ["ndin", "NativeDisplayInfo"], ["pre0", "Preview0"], ["pre1", "Preview1"], ["pre2", "Preview2"], ["ps2i", "PS2RenderingIntent"], ["ps2s", "PostScript2CSA"], ["psd0", "PostScript2CRD0"], ["psd1", "PostScript2CRD1"], ["psd2", "PostScript2CRD2"], ["psd3", "PostScript2CRD3"], ["pseq", "ProfileSequenceDesc"], ["psid", "ProfileSequenceIdentifier"], ["psvm", "PS2CRDVMSize"], ["rTRC", "RedTRC"], ["rXYZ", "RedMatrixColumn"], ["resp", "OutputResponse"], ["rhoc", "ReflectionHardcopyOrigColorimetry"], ["rig0", "PerceptualRenderingIntentGamut"], ["rig2", "SaturationRenderingIntentGamut"], ["rpoc", "ReflectionPrintOutputColorimetry"], ["sape", "SceneAppearanceEstimates"], ["scoe", "SceneColorimetryEstimates"], ["scrd", "ScreeningDesc"], ["scrn", "Screening"], ["targ", "CharTarget"], ["tech", "Technology"], ["vcgt", "VideoCardGamma"], ["view", "ViewingConditions"], ["vued", "ViewingCondDesc"], ["wtpt", "MediaWhitePoint"]]);
+ var St = { "4d2p": "Erdt Systems", AAMA: "Aamazing Technologies", ACER: "Acer", ACLT: "Acolyte Color Research", ACTI: "Actix Sytems", ADAR: "Adara Technology", ADBE: "Adobe", ADI: "ADI Systems", AGFA: "Agfa Graphics", ALMD: "Alps Electric", ALPS: "Alps Electric", ALWN: "Alwan Color Expertise", AMTI: "Amiable Technologies", AOC: "AOC International", APAG: "Apago", APPL: "Apple Computer", AST: "AST", "AT&T": "AT&T", BAEL: "BARBIERI electronic", BRCO: "Barco NV", BRKP: "Breakpoint", BROT: "Brother", BULL: "Bull", BUS: "Bus Computer Systems", "C-IT": "C-Itoh", CAMR: "Intel", CANO: "Canon", CARR: "Carroll Touch", CASI: "Casio", CBUS: "Colorbus PL", CEL: "Crossfield", CELx: "Crossfield", CGS: "CGS Publishing Technologies International", CHM: "Rochester Robotics", CIGL: "Colour Imaging Group, London", CITI: "Citizen", CL00: "Candela", CLIQ: "Color IQ", CMCO: "Chromaco", CMiX: "CHROMiX", COLO: "Colorgraphic Communications", COMP: "Compaq", COMp: "Compeq/Focus Technology", CONR: "Conrac Display Products", CORD: "Cordata Technologies", CPQ: "Compaq", CPRO: "ColorPro", CRN: "Cornerstone", CTX: "CTX International", CVIS: "ColorVision", CWC: "Fujitsu Laboratories", DARI: "Darius Technology", DATA: "Dataproducts", DCP: "Dry Creek Photo", DCRC: "Digital Contents Resource Center, Chung-Ang University", DELL: "Dell Computer", DIC: "Dainippon Ink and Chemicals", DICO: "Diconix", DIGI: "Digital", "DL&C": "Digital Light & Color", DPLG: "Doppelganger", DS: "Dainippon Screen", DSOL: "DOOSOL", DUPN: "DuPont", EPSO: "Epson", ESKO: "Esko-Graphics", ETRI: "Electronics and Telecommunications Research Institute", EVER: "Everex Systems", EXAC: "ExactCODE", Eizo: "Eizo", FALC: "Falco Data Products", FF: "Fuji Photo Film", FFEI: "FujiFilm Electronic Imaging", FNRD: "Fnord Software", FORA: "Fora", FORE: "Forefront Technology", FP: "Fujitsu", FPA: "WayTech Development", FUJI: "Fujitsu", FX: "Fuji Xerox", GCC: "GCC Technologies", GGSL: "Global Graphics Software", GMB: "Gretagmacbeth", GMG: "GMG", GOLD: "GoldStar Technology", GOOG: "Google", GPRT: "Giantprint", GTMB: "Gretagmacbeth", GVC: "WayTech Development", GW2K: "Sony", HCI: "HCI", HDM: "Heidelberger Druckmaschinen", HERM: "Hermes", HITA: "Hitachi America", HP: "Hewlett-Packard", HTC: "Hitachi", HiTi: "HiTi Digital", IBM: "IBM", IDNT: "Scitex", IEC: "Hewlett-Packard", IIYA: "Iiyama North America", IKEG: "Ikegami Electronics", IMAG: "Image Systems", IMI: "Ingram Micro", INTC: "Intel", INTL: "N/A (INTL)", INTR: "Intra Electronics", IOCO: "Iocomm International Technology", IPS: "InfoPrint Solutions Company", IRIS: "Scitex", ISL: "Ichikawa Soft Laboratory", ITNL: "N/A (ITNL)", IVM: "IVM", IWAT: "Iwatsu Electric", Idnt: "Scitex", Inca: "Inca Digital Printers", Iris: "Scitex", JPEG: "Joint Photographic Experts Group", JSFT: "Jetsoft Development", JVC: "JVC Information Products", KART: "Scitex", KFC: "KFC Computek Components", KLH: "KLH Computers", KMHD: "Konica Minolta", KNCA: "Konica", KODA: "Kodak", KYOC: "Kyocera", Kart: "Scitex", LCAG: "Leica", LCCD: "Leeds Colour", LDAK: "Left Dakota", LEAD: "Leading Technology", LEXM: "Lexmark International", LINK: "Link Computer", LINO: "Linotronic", LITE: "Lite-On", Leaf: "Leaf", Lino: "Linotronic", MAGC: "Mag Computronic", MAGI: "MAG Innovision", MANN: "Mannesmann", MICN: "Micron Technology", MICR: "Microtek", MICV: "Microvitec", MINO: "Minolta", MITS: "Mitsubishi Electronics America", MITs: "Mitsuba", MNLT: "Minolta", MODG: "Modgraph", MONI: "Monitronix", MONS: "Monaco Systems", MORS: "Morse Technology", MOTI: "Motive Systems", MSFT: "Microsoft", MUTO: "MUTOH INDUSTRIES", Mits: "Mitsubishi Electric", NANA: "NANAO", NEC: "NEC", NEXP: "NexPress Solutions", NISS: "Nissei Sangyo America", NKON: "Nikon", NONE: "none", OCE: "Oce Technologies", OCEC: "OceColor", OKI: "Oki", OKID: "Okidata", OKIP: "Okidata", OLIV: "Olivetti", OLYM: "Olympus", ONYX: "Onyx Graphics", OPTI: "Optiquest", PACK: "Packard Bell", PANA: "Matsushita Electric Industrial", PANT: "Pantone", PBN: "Packard Bell", PFU: "PFU", PHIL: "Philips Consumer Electronics", PNTX: "HOYA", POne: "Phase One A/S", PREM: "Premier Computer Innovations", PRIN: "Princeton Graphic Systems", PRIP: "Princeton Publishing Labs", QLUX: "Hong Kong", QMS: "QMS", QPCD: "QPcard AB", QUAD: "QuadLaser", QUME: "Qume", RADI: "Radius", RDDx: "Integrated Color Solutions", RDG: "Roland DG", REDM: "REDMS Group", RELI: "Relisys", RGMS: "Rolf Gierling Multitools", RICO: "Ricoh", RNLD: "Edmund Ronald", ROYA: "Royal", RPC: "Ricoh Printing Systems", RTL: "Royal Information Electronics", SAMP: "Sampo", SAMS: "Samsung", SANT: "Jaime Santana Pomares", SCIT: "Scitex", SCRN: "Dainippon Screen", SDP: "Scitex", SEC: "Samsung", SEIK: "Seiko Instruments", SEIk: "Seikosha", SGUY: "ScanGuy.com", SHAR: "Sharp Laboratories", SICC: "International Color Consortium", SONY: "Sony", SPCL: "SpectraCal", STAR: "Star", STC: "Sampo Technology", Scit: "Scitex", Sdp: "Scitex", Sony: "Sony", TALO: "Talon Technology", TAND: "Tandy", TATU: "Tatung", TAXA: "TAXAN America", TDS: "Tokyo Denshi Sekei", TECO: "TECO Information Systems", TEGR: "Tegra", TEKT: "Tektronix", TI: "Texas Instruments", TMKR: "TypeMaker", TOSB: "Toshiba", TOSH: "Toshiba", TOTK: "TOTOKU ELECTRIC", TRIU: "Triumph", TSBT: "Toshiba", TTX: "TTX Computer Products", TVM: "TVM Professional Monitor", TW: "TW Casper", ULSX: "Ulead Systems", UNIS: "Unisys", UTZF: "Utz Fehlau & Sohn", VARI: "Varityper", VIEW: "Viewsonic", VISL: "Visual communication", VIVO: "Vivo Mobile Communication", WANG: "Wang", WLBR: "Wilbur Imaging", WTG2: "Ware To Go", WYSE: "WYSE Technology", XERX: "Xerox", XRIT: "X-Rite", ZRAN: "Zoran", Zebr: "Zebra Technologies", appl: "Apple Computer", bICC: "basICColor", berg: "bergdesign", ceyd: "Integrated Color Solutions", clsp: "MacDermid ColorSpan", ds: "Dainippon Screen", dupn: "DuPont", ffei: "FujiFilm Electronic Imaging", flux: "FluxData", iris: "Scitex", kart: "Scitex", lcms: "Little CMS", lino: "Linotronic", none: "none", ob4d: "Erdt Systems", obic: "Medigraph", quby: "Qubyx Sarl", scit: "Scitex", scrn: "Dainippon Screen", sdp: "Scitex", siwi: "SIWI GRAFIKA", yxym: "YxyMaster" };
+ var Ct = { scnr: "Scanner", mntr: "Monitor", prtr: "Printer", link: "Device Link", abst: "Abstract", spac: "Color Space Conversion Profile", nmcl: "Named Color", cenc: "ColorEncodingSpace profile", mid: "MultiplexIdentification profile", mlnk: "MultiplexLink profile", mvis: "MultiplexVisualization profile", nkpf: "Nikon Input Device Profile (NON-STANDARD!)" };
+ U(B, "icc", [[4, St], [12, Ct], [40, Object.assign({}, St, Ct)], [48, St], [80, St], [64, { 0: "Perceptual", 1: "Relative Colorimetric", 2: "Saturation", 3: "Absolute Colorimetric" }], ["tech", { amd: "Active Matrix Display", crt: "Cathode Ray Tube Display", kpcd: "Photo CD", pmd: "Passive Matrix Display", dcam: "Digital Camera", dcpj: "Digital Cinema Projector", dmpc: "Digital Motion Picture Camera", dsub: "Dye Sublimation Printer", epho: "Electrophotographic Printer", esta: "Electrostatic Printer", flex: "Flexography", fprn: "Film Writer", fscn: "Film Scanner", grav: "Gravure", ijet: "Ink Jet Printer", imgs: "Photo Image Setter", mpfr: "Motion Picture Film Recorder", mpfs: "Motion Picture Film Scanner", offs: "Offset Lithography", pjtv: "Projection Television", rpho: "Photographic Paper Printer", rscn: "Reflective Scanner", silk: "Silkscreen", twax: "Thermal Wax Printer", vidc: "Video Camera", vidm: "Video Monitor" }]]);
+ var yt = class extends re2 {
+ static canHandle(e3, t2, i3) {
+ return 237 === e3.getUint8(t2 + 1) && "Photoshop" === e3.getString(t2 + 4, 9) && void 0 !== this.containsIptc8bim(e3, t2, i3);
+ }
+ static headerLength(e3, t2, i3) {
+ let n3, s2 = this.containsIptc8bim(e3, t2, i3);
+ if (void 0 !== s2) return n3 = e3.getUint8(t2 + s2 + 7), n3 % 2 != 0 && (n3 += 1), 0 === n3 && (n3 = 4), s2 + 8 + n3;
+ }
+ static containsIptc8bim(e3, t2, i3) {
+ for (let n3 = 0; n3 < i3; n3++) if (this.isIptcSegmentHead(e3, t2 + n3)) return n3;
+ }
+ static isIptcSegmentHead(e3, t2) {
+ return 56 === e3.getUint8(t2) && 943868237 === e3.getUint32(t2) && 1028 === e3.getUint16(t2 + 4);
+ }
+ parse() {
+ let { raw: e3 } = this, t2 = this.chunk.byteLength - 1, i3 = false;
+ for (let n3 = 0; n3 < t2; n3++) if (28 === this.chunk.getUint8(n3) && 2 === this.chunk.getUint8(n3 + 1)) {
+ i3 = true;
+ let t3 = this.chunk.getUint16(n3 + 3), s2 = this.chunk.getUint8(n3 + 2), r2 = this.chunk.getLatin1String(n3 + 5, t3);
+ e3.set(s2, this.pluralizeValue(e3.get(s2), r2)), n3 += 4 + t3;
+ } else if (i3) break;
+ return this.translate(), this.output;
+ }
+ pluralizeValue(e3, t2) {
+ return void 0 !== e3 ? e3 instanceof Array ? (e3.push(t2), e3) : [e3, t2] : t2;
+ }
+ };
+ c(yt, "type", "iptc"), c(yt, "translateValues", false), c(yt, "reviveValues", false), T.set("iptc", yt), U(E, "iptc", [[0, "ApplicationRecordVersion"], [3, "ObjectTypeReference"], [4, "ObjectAttributeReference"], [5, "ObjectName"], [7, "EditStatus"], [8, "EditorialUpdate"], [10, "Urgency"], [12, "SubjectReference"], [15, "Category"], [20, "SupplementalCategories"], [22, "FixtureIdentifier"], [25, "Keywords"], [26, "ContentLocationCode"], [27, "ContentLocationName"], [30, "ReleaseDate"], [35, "ReleaseTime"], [37, "ExpirationDate"], [38, "ExpirationTime"], [40, "SpecialInstructions"], [42, "ActionAdvised"], [45, "ReferenceService"], [47, "ReferenceDate"], [50, "ReferenceNumber"], [55, "DateCreated"], [60, "TimeCreated"], [62, "DigitalCreationDate"], [63, "DigitalCreationTime"], [65, "OriginatingProgram"], [70, "ProgramVersion"], [75, "ObjectCycle"], [80, "Byline"], [85, "BylineTitle"], [90, "City"], [92, "Sublocation"], [95, "State"], [100, "CountryCode"], [101, "Country"], [103, "OriginalTransmissionReference"], [105, "Headline"], [110, "Credit"], [115, "Source"], [116, "CopyrightNotice"], [118, "Contact"], [120, "Caption"], [121, "LocalCaption"], [122, "Writer"], [125, "RasterizedCaption"], [130, "ImageType"], [131, "ImageOrientation"], [135, "LanguageIdentifier"], [150, "AudioType"], [151, "AudioSamplingRate"], [152, "AudioSamplingResolution"], [153, "AudioDuration"], [154, "AudioOutcue"], [184, "JobID"], [185, "MasterDocumentID"], [186, "ShortDocumentID"], [187, "UniqueDocumentID"], [188, "OwnerID"], [200, "ObjectPreviewFileFormat"], [201, "ObjectPreviewFileVersion"], [202, "ObjectPreviewData"], [221, "Prefs"], [225, "ClassifyState"], [228, "SimilarityIndex"], [230, "DocumentNotes"], [231, "DocumentHistory"], [232, "ExifCameraInfo"], [255, "CatalogSets"]]), U(B, "iptc", [[10, { 0: "0 (reserved)", 1: "1 (most urgent)", 2: "2", 3: "3", 4: "4", 5: "5 (normal urgency)", 6: "6", 7: "7", 8: "8 (least urgent)", 9: "9 (user-defined priority)" }], [75, { a: "Morning", b: "Both Morning and Evening", p: "Evening" }], [131, { L: "Landscape", P: "Portrait", S: "Square" }]]);
+ var full_esm_default = tt;
+
+ // modules/services/plane_photo.js
+ var dispatch5 = dispatch_default("viewerChanged");
+ var _photo;
+ var _wrapper;
+ var imgZoom;
+ var _widthOverflow;
+ function zoomPan(d3_event) {
+ let t2 = d3_event.transform;
+ _photo.call(utilSetTransform, t2.x, t2.y, t2.k);
+ }
+ function zoomBeahvior() {
+ const { width: wrapperWidth, height: wrapperHeight } = _wrapper.node().getBoundingClientRect();
+ const { naturalHeight, naturalWidth } = _photo.node();
+ const intrinsicRatio = naturalWidth / naturalHeight;
+ _widthOverflow = wrapperHeight * intrinsicRatio - wrapperWidth;
+ return zoom_default2().extent([[0, 0], [wrapperWidth, wrapperHeight]]).translateExtent([[0, 0], [wrapperWidth + _widthOverflow, wrapperHeight]]).scaleExtent([1, 15]).on("zoom", zoomPan);
+ }
+ function loadImage(selection2, path) {
+ return new Promise((resolve) => {
+ selection2.attr("src", path);
+ selection2.on("load", () => {
+ resolve(selection2);
});
- return drawLayers.remove(utilArrayDifference(all, arr));
- };
- drawLayers.remove = function(what) {
- var arr = [].concat(what);
- arr.forEach(function(id2) {
- _layers = _layers.filter(function(o) {
- return o.id !== id2;
- });
+ });
+ }
+ var plane_photo_default = {
+ init: async function(context, selection2) {
+ this.event = utilRebind(this, dispatch5, "on");
+ _wrapper = selection2.append("div").attr("class", "photo-frame plane-frame").classed("hide", true);
+ _photo = _wrapper.append("img").attr("class", "plane-photo");
+ context.ui().photoviewer.on("resize.plane", () => {
+ imgZoom = zoomBeahvior();
+ _wrapper.call(imgZoom);
});
- dispatch10.call("change");
+ await Promise.resolve();
return this;
- };
- drawLayers.add = function(what) {
- var arr = [].concat(what);
- arr.forEach(function(obj) {
- if ("id" in obj && "layer" in obj) {
- _layers.push(obj);
- }
- });
- dispatch10.call("change");
+ },
+ showPhotoFrame: function(context) {
+ const isHidden = context.selectAll(".photo-frame.plane-frame.hide").size();
+ if (isHidden) {
+ context.selectAll(".photo-frame:not(.plane-frame)").classed("hide", true);
+ context.selectAll(".photo-frame.plane-frame").classed("hide", false);
+ }
return this;
- };
- drawLayers.dimensions = function(val) {
- if (!arguments.length)
- return utilGetDimensions(svg2);
- utilSetDimensions(svg2, val);
+ },
+ hidePhotoFrame: function(context) {
+ context.select("photo-frame.plane-frame").classed("hide", false);
return this;
- };
- return utilRebind(drawLayers, dispatch10, "on");
- }
-
- // modules/svg/lines.js
- var import_fast_deep_equal6 = __toESM(require_fast_deep_equal());
- function svgLines(projection2, context) {
- var detected = utilDetect();
- var highway_stack = {
- motorway: 0,
- motorway_link: 1,
- trunk: 2,
- trunk_link: 3,
- primary: 4,
- primary_link: 5,
- secondary: 6,
- tertiary: 7,
- unclassified: 8,
- residential: 9,
- service: 10,
- footway: 11
- };
- function drawTargets(selection2, graph, entities, filter2) {
- var targetClass = context.getDebug("target") ? "pink " : "nocolor ";
- var nopeClass = context.getDebug("target") ? "red " : "nocolor ";
- var getPath = svgPath(projection2).geojson;
- var activeID = context.activeID();
- var base = context.history().base();
- var data = { targets: [], nopes: [] };
- entities.forEach(function(way) {
- var features2 = svgSegmentWay(way, graph, activeID);
- data.targets.push.apply(data.targets, features2.passive);
- data.nopes.push.apply(data.nopes, features2.active);
- });
- var targetData = data.targets.filter(getPath);
- var targets = selection2.selectAll(".line.target-allowed").filter(function(d) {
- return filter2(d.properties.entity);
- }).data(targetData, function key(d) {
- return d.id;
- });
- targets.exit().remove();
- var segmentWasEdited = function(d) {
- var wayID = d.properties.entity.id;
- if (!base.entities[wayID] || !(0, import_fast_deep_equal6.default)(graph.entities[wayID].nodes, base.entities[wayID].nodes)) {
- return false;
- }
- return d.properties.nodes.some(function(n2) {
- return !base.entities[n2.id] || !(0, import_fast_deep_equal6.default)(graph.entities[n2.id].loc, base.entities[n2.id].loc);
- });
- };
- targets.enter().append("path").merge(targets).attr("d", getPath).attr("class", function(d) {
- return "way line target target-allowed " + targetClass + d.id;
- }).classed("segment-edited", segmentWasEdited);
- var nopeData = data.nopes.filter(getPath);
- var nopes = selection2.selectAll(".line.target-nope").filter(function(d) {
- return filter2(d.properties.entity);
- }).data(nopeData, function key(d) {
- return d.id;
- });
- nopes.exit().remove();
- nopes.enter().append("path").merge(nopes).attr("d", getPath).attr("class", function(d) {
- return "way line target target-nope " + nopeClass + d.id;
- }).classed("segment-edited", segmentWasEdited);
- }
- function drawLines(selection2, graph, entities, filter2) {
- var base = context.history().base();
- function waystack(a, b) {
- var selected = context.selectedIDs();
- var scoreA = selected.indexOf(a.id) !== -1 ? 20 : 0;
- var scoreB = selected.indexOf(b.id) !== -1 ? 20 : 0;
- if (a.tags.highway) {
- scoreA -= highway_stack[a.tags.highway];
- }
- if (b.tags.highway) {
- scoreB -= highway_stack[b.tags.highway];
- }
- return scoreA - scoreB;
- }
- function drawLineGroup(selection3, klass, isSelected) {
- var mode = context.mode();
- var isDrawing = mode && /^draw/.test(mode.id);
- var selectedClass = !isDrawing && isSelected ? "selected " : "";
- var lines = selection3.selectAll("path").filter(filter2).data(getPathData(isSelected), osmEntity.key);
- lines.exit().remove();
- lines.enter().append("path").attr("class", function(d) {
- var prefix = "way line";
- if (!d.hasInterestingTags()) {
- var parentRelations = graph.parentRelations(d);
- var parentMultipolygons = parentRelations.filter(function(relation) {
- return relation.isMultipolygon();
- });
- if (parentMultipolygons.length > 0 && parentRelations.length === parentMultipolygons.length) {
- prefix = "relation area";
- }
- }
- var oldMPClass = oldMultiPolygonOuters[d.id] ? "old-multipolygon " : "";
- return prefix + " " + klass + " " + selectedClass + oldMPClass + d.id;
- }).classed("added", function(d) {
- return !base.entities[d.id];
- }).classed("geometry-edited", function(d) {
- return graph.entities[d.id] && base.entities[d.id] && !(0, import_fast_deep_equal6.default)(graph.entities[d.id].nodes, base.entities[d.id].nodes);
- }).classed("retagged", function(d) {
- return graph.entities[d.id] && base.entities[d.id] && !(0, import_fast_deep_equal6.default)(graph.entities[d.id].tags, base.entities[d.id].tags);
- }).call(svgTagClasses()).merge(lines).sort(waystack).attr("d", getPath).call(svgTagClasses().tags(svgRelationMemberTags(graph)));
- return selection3;
- }
- function getPathData(isSelected) {
- return function() {
- var layer = this.parentNode.__data__;
- var data = pathdata[layer] || [];
- return data.filter(function(d) {
- if (isSelected) {
- return context.selectedIDs().indexOf(d.id) !== -1;
- } else {
- return context.selectedIDs().indexOf(d.id) === -1;
- }
- });
- };
- }
- function addMarkers(layergroup, pathclass, groupclass, groupdata, marker) {
- var markergroup = layergroup.selectAll("g." + groupclass).data([pathclass]);
- markergroup = markergroup.enter().append("g").attr("class", groupclass).merge(markergroup);
- var markers = markergroup.selectAll("path").filter(filter2).data(function data() {
- return groupdata[this.parentNode.__data__] || [];
- }, function key(d) {
- return [d.id, d.index];
- });
- markers.exit().remove();
- markers = markers.enter().append("path").attr("class", pathclass).merge(markers).attr("marker-mid", marker).attr("d", function(d) {
- return d.d;
- });
- if (detected.ie) {
- markers.each(function() {
- this.parentNode.insertBefore(this, this);
- });
- }
- }
- var getPath = svgPath(projection2, graph);
- var ways = [];
- var onewaydata = {};
- var sideddata = {};
- var oldMultiPolygonOuters = {};
- for (var i2 = 0; i2 < entities.length; i2++) {
- var entity = entities[i2];
- var outer = osmOldMultipolygonOuterMember(entity, graph);
- if (outer) {
- ways.push(entity.mergeTags(outer.tags));
- oldMultiPolygonOuters[outer.id] = true;
- } else if (entity.geometry(graph) === "line") {
- ways.push(entity);
- }
- }
- ways = ways.filter(getPath);
- var pathdata = utilArrayGroupBy(ways, function(way) {
- return way.layer();
- });
- Object.keys(pathdata).forEach(function(k) {
- var v = pathdata[k];
- var onewayArr = v.filter(function(d) {
- return d.isOneWay();
- });
- var onewaySegments = svgMarkerSegments(projection2, graph, 35, function shouldReverse(entity2) {
- return entity2.tags.oneway === "-1";
- }, function bothDirections(entity2) {
- return entity2.tags.oneway === "reversible" || entity2.tags.oneway === "alternating";
- });
- onewaydata[k] = utilArrayFlatten(onewayArr.map(onewaySegments));
- var sidedArr = v.filter(function(d) {
- return d.isSided();
- });
- var sidedSegments = svgMarkerSegments(projection2, graph, 30, function shouldReverse() {
- return false;
- }, function bothDirections() {
- return false;
- });
- sideddata[k] = utilArrayFlatten(sidedArr.map(sidedSegments));
+ },
+ selectPhoto: function(data) {
+ dispatch5.call("viewerChanged");
+ loadImage(_photo, "");
+ loadImage(_photo, data.image_path).then(() => {
+ imgZoom = zoomBeahvior();
+ _wrapper.call(imgZoom);
+ _wrapper.call(imgZoom.transform, identity2.translate(-_widthOverflow / 2, 0));
});
- var covered = selection2.selectAll(".layer-osm.covered");
- var uncovered = selection2.selectAll(".layer-osm.lines");
- var touchLayer = selection2.selectAll(".layer-touch.lines");
- [covered, uncovered].forEach(function(selection3) {
- var range3 = selection3 === covered ? range(-10, 0) : range(0, 11);
- var layergroup = selection3.selectAll("g.layergroup").data(range3);
- layergroup = layergroup.enter().append("g").attr("class", function(d) {
- return "layergroup layer" + String(d);
- }).merge(layergroup);
- layergroup.selectAll("g.linegroup").data(["shadow", "casing", "stroke", "shadow-highlighted", "casing-highlighted", "stroke-highlighted"]).enter().append("g").attr("class", function(d) {
- return "linegroup line-" + d;
+ return this;
+ },
+ getYaw: function() {
+ return 0;
+ }
+ };
+
+ // modules/svg/local_photos.js
+ var _initialized2 = false;
+ var _enabled2 = false;
+ var minViewfieldZoom = 16;
+ function svgLocalPhotos(projection2, context, dispatch14) {
+ const detected = utilDetect();
+ let layer = select_default2(null);
+ let _fileList;
+ let _photos = [];
+ let _idAutoinc = 0;
+ let _photoFrame;
+ function init2() {
+ if (_initialized2) return;
+ _enabled2 = true;
+ function over(d3_event) {
+ d3_event.stopPropagation();
+ d3_event.preventDefault();
+ d3_event.dataTransfer.dropEffect = "copy";
+ }
+ context.container().attr("dropzone", "copy").on("drop.svgLocalPhotos", function(d3_event) {
+ d3_event.stopPropagation();
+ d3_event.preventDefault();
+ if (!detected.filedrop) return;
+ drawPhotos.fileList(d3_event.dataTransfer.files, (loaded) => {
+ if (loaded.length > 0) {
+ drawPhotos.fitZoom(false);
+ }
});
- layergroup.selectAll("g.line-shadow").call(drawLineGroup, "shadow", false);
- layergroup.selectAll("g.line-casing").call(drawLineGroup, "casing", false);
- layergroup.selectAll("g.line-stroke").call(drawLineGroup, "stroke", false);
- layergroup.selectAll("g.line-shadow-highlighted").call(drawLineGroup, "shadow", true);
- layergroup.selectAll("g.line-casing-highlighted").call(drawLineGroup, "casing", true);
- layergroup.selectAll("g.line-stroke-highlighted").call(drawLineGroup, "stroke", true);
- addMarkers(layergroup, "oneway", "onewaygroup", onewaydata, "url(#ideditor-oneway-marker)");
- addMarkers(layergroup, "sided", "sidedgroup", sideddata, function marker(d) {
- var category = graph.entity(d.id).sidednessIdentifier();
- return "url(#ideditor-sided-marker-" + category + ")";
+ }).on("dragenter.svgLocalPhotos", over).on("dragexit.svgLocalPhotos", over).on("dragover.svgLocalPhotos", over);
+ _initialized2 = true;
+ }
+ function ensureViewerLoaded(context2) {
+ if (_photoFrame) {
+ return Promise.resolve(_photoFrame);
+ }
+ const viewer = context2.container().select(".photoviewer").selectAll(".local-photos-wrapper").data([0]);
+ const viewerEnter = viewer.enter().append("div").attr("class", "photo-wrapper local-photos-wrapper").classed("hide", true);
+ viewerEnter.append("div").attr("class", "photo-attribution photo-attribution-dual fillD");
+ return plane_photo_default.init(context2, viewerEnter).then((planePhotoFrame) => {
+ _photoFrame = planePhotoFrame;
+ });
+ }
+ function click(d3_event, image, zoomTo) {
+ ensureViewerLoaded(context).then(() => {
+ const viewer = context.container().select(".photoviewer").datum(image).classed("hide", false);
+ const viewerWrap = viewer.select(".local-photos-wrapper").classed("hide", false);
+ const attribution = viewerWrap.selectAll(".photo-attribution").text("");
+ if (image.date) {
+ attribution.append("span").text(image.date.toLocaleString());
+ }
+ if (image.name) {
+ attribution.append("span").classed("filename", true).text(image.name);
+ }
+ _photoFrame.selectPhoto({ image_path: "" });
+ image.getSrc().then((src) => {
+ _photoFrame.selectPhoto({ image_path: src }).showPhotoFrame(viewerWrap);
+ setStyles();
});
});
- touchLayer.call(drawTargets, graph, ways, filter2);
+ if (zoomTo) {
+ context.map().centerEase(image.loc);
+ }
}
- return drawLines;
- }
-
- // modules/svg/midpoints.js
- function svgMidpoints(projection2, context) {
- var targetRadius = 8;
- function drawTargets(selection2, graph, entities, filter2) {
- var fillClass = context.getDebug("target") ? "pink " : "nocolor ";
- var getTransform = svgPointTransform(projection2).geojson;
- var data = entities.map(function(midpoint) {
- return {
- type: "Feature",
- id: midpoint.id,
- properties: {
- target: true,
- entity: midpoint
- },
- geometry: {
- type: "Point",
- coordinates: midpoint.loc
- }
- };
+ function transform2(d2) {
+ var svgpoint = projection2(d2.loc);
+ return "translate(" + svgpoint[0] + "," + svgpoint[1] + ")";
+ }
+ function setStyles(hovered) {
+ const viewer = context.container().select(".photoviewer");
+ const selected = viewer.empty() ? void 0 : viewer.datum();
+ context.container().selectAll(".layer-local-photos .viewfield-group").classed("hovered", (d2) => d2.id === (hovered == null ? void 0 : hovered.id)).classed("highlighted", (d2) => d2.id === (hovered == null ? void 0 : hovered.id) || d2.id === (selected == null ? void 0 : selected.id)).classed("currentView", (d2) => d2.id === (selected == null ? void 0 : selected.id));
+ }
+ function display_markers(imageList) {
+ imageList = imageList.filter((image) => isArray_default(image.loc) && isNumber_default(image.loc[0]) && isNumber_default(image.loc[1]));
+ const groups = layer.selectAll(".markers").selectAll(".viewfield-group").data(imageList, function(d2) {
+ return d2.id;
});
- var targets = selection2.selectAll(".midpoint.target").filter(function(d) {
- return filter2(d.properties.entity);
- }).data(data, function key(d) {
- return d.id;
+ groups.exit().remove();
+ const groupsEnter = groups.enter().append("g").attr("class", "viewfield-group").on("mouseenter", (d3_event, d2) => setStyles(d2)).on("mouseleave", () => setStyles(null)).on("click", click);
+ groupsEnter.append("g").attr("class", "viewfield-scale");
+ const markers = groups.merge(groupsEnter).attr("transform", transform2).select(".viewfield-scale");
+ markers.selectAll("circle").data([0]).enter().append("circle").attr("dx", "0").attr("dy", "0").attr("r", "6");
+ const showViewfields = context.map().zoom() >= minViewfieldZoom;
+ const viewfields = markers.selectAll(".viewfield").data(showViewfields ? [0] : []);
+ viewfields.exit().remove();
+ viewfields.enter().insert("path", "circle").attr("class", "viewfield").attr("transform", function() {
+ var _a4;
+ const d2 = this.parentNode.__data__;
+ return "rotate(".concat(Math.round((_a4 = d2.direction) != null ? _a4 : 0), ",0,0),scale(1.5,1.5),translate(-8,-13)");
+ }).attr("d", "M 6,9 C 8,8.4 8,8.4 10,9 L 16,-2 C 12,-5 4,-5 0,-2 z").style("visibility", function() {
+ const d2 = this.parentNode.__data__;
+ return isNumber_default(d2.direction) ? "visible" : "hidden";
});
- targets.exit().remove();
- targets.enter().append("circle").attr("r", targetRadius).merge(targets).attr("class", function(d) {
- return "node midpoint target " + fillClass + d.id;
- }).attr("transform", getTransform);
}
- function drawMidpoints(selection2, graph, entities, filter2, extent) {
- var drawLayer = selection2.selectAll(".layer-osm.points .points-group.midpoints");
- var touchLayer = selection2.selectAll(".layer-touch.points");
- var mode = context.mode();
- if (mode && mode.id !== "select" || !context.map().withinEditableZoom()) {
- drawLayer.selectAll(".midpoint").remove();
- touchLayer.selectAll(".midpoint.target").remove();
- return;
+ function drawPhotos(selection2) {
+ layer = selection2.selectAll(".layer-local-photos").data(_photos ? [0] : []);
+ layer.exit().remove();
+ const layerEnter = layer.enter().append("g").attr("class", "layer-local-photos");
+ layerEnter.append("g").attr("class", "markers");
+ layer = layerEnter.merge(layer);
+ if (_photos) {
+ display_markers(_photos);
}
- var poly = extent.polygon();
- var midpoints = {};
- for (var i2 = 0; i2 < entities.length; i2++) {
- var entity = entities[i2];
- if (entity.type !== "way")
- continue;
- if (!filter2(entity))
- continue;
- if (context.selectedIDs().indexOf(entity.id) < 0)
- continue;
- var nodes = graph.childNodes(entity);
- for (var j2 = 0; j2 < nodes.length - 1; j2++) {
- var a = nodes[j2];
- var b = nodes[j2 + 1];
- var id2 = [a.id, b.id].sort().join("-");
- if (midpoints[id2]) {
- midpoints[id2].parents.push(entity);
- } else if (geoVecLength(projection2(a.loc), projection2(b.loc)) > 40) {
- var point = geoVecInterp(a.loc, b.loc, 0.5);
- var loc = null;
- if (extent.intersects(point)) {
- loc = point;
- } else {
- for (var k = 0; k < 4; k++) {
- point = geoLineIntersection([a.loc, b.loc], [poly[k], poly[k + 1]]);
- if (point && geoVecLength(projection2(a.loc), projection2(point)) > 20 && geoVecLength(projection2(b.loc), projection2(point)) > 20) {
- loc = point;
- break;
- }
- }
- }
- if (loc) {
- midpoints[id2] = {
- type: "midpoint",
- id: id2,
- loc,
- edge: [a.id, b.id],
- parents: [entity]
- };
+ }
+ function readFileAsDataURL(file) {
+ return new Promise((resolve, reject) => {
+ const reader = new FileReader();
+ reader.onload = () => resolve(reader.result);
+ reader.onerror = (error) => reject(error);
+ reader.readAsDataURL(file);
+ });
+ }
+ async function readmultifiles(files, callback) {
+ const loaded = [];
+ for (const file of files) {
+ try {
+ const exifData = await full_esm_default.parse(file);
+ const photo = {
+ id: _idAutoinc++,
+ name: file.name,
+ getSrc: () => readFileAsDataURL(file),
+ file,
+ loc: [exifData.longitude, exifData.latitude],
+ direction: exifData.GPSImgDirection,
+ date: exifData.CreateDate || exifData.DateTimeOriginal || exifData.ModifyDate
+ };
+ loaded.push(photo);
+ const sameName = _photos.filter((i3) => i3.name === photo.name);
+ if (sameName.length === 0) {
+ _photos.push(photo);
+ } else {
+ const thisContent = await photo.getSrc();
+ const sameNameContent = await Promise.allSettled(sameName.map((i3) => i3.getSrc()));
+ if (!sameNameContent.some((i3) => i3.value === thisContent)) {
+ _photos.push(photo);
}
}
+ } catch (e3) {
}
}
- function midpointFilter(d) {
- if (midpoints[d.id])
- return true;
- for (var i3 = 0; i3 < d.parents.length; i3++) {
- if (filter2(d.parents[i3])) {
- return true;
- }
- }
- return false;
+ if (typeof callback === "function") callback(loaded);
+ dispatch14.call("change");
+ }
+ drawPhotos.setFiles = function(fileList, callback) {
+ readmultifiles(Array.from(fileList), callback);
+ return this;
+ };
+ drawPhotos.fileList = function(fileList, callback) {
+ if (!arguments.length) return _fileList;
+ _fileList = fileList;
+ if (!fileList || !fileList.length) return this;
+ drawPhotos.setFiles(_fileList, callback);
+ return this;
+ };
+ drawPhotos.getPhotos = function() {
+ return _photos;
+ };
+ drawPhotos.removePhoto = function(id2) {
+ _photos = _photos.filter((i3) => i3.id !== id2);
+ dispatch14.call("change");
+ return _photos;
+ };
+ drawPhotos.openPhoto = click;
+ drawPhotos.fitZoom = function(force) {
+ const coords = _photos.map((image) => image.loc).filter((l2) => isArray_default(l2) && isNumber_default(l2[0]) && isNumber_default(l2[1]));
+ if (coords.length === 0) return;
+ const extent = coords.map((l2) => geoExtent(l2, l2)).reduce((a2, b2) => a2.extend(b2));
+ const map2 = context.map();
+ var viewport = map2.trimmedExtent().polygon();
+ if (force !== false || !geoPolygonIntersectsPolygon(viewport, coords, true)) {
+ map2.centerZoom(extent.center(), Math.min(18, map2.trimmedExtentZoom(extent)));
}
- var groups = drawLayer.selectAll(".midpoint").filter(midpointFilter).data(Object.values(midpoints), function(d) {
- return d.id;
+ };
+ function showLayer() {
+ layer.style("display", "block");
+ layer.style("opacity", 0).transition().duration(250).style("opacity", 1).on("end", function() {
+ dispatch14.call("change");
});
- groups.exit().remove();
- var enter = groups.enter().insert("g", ":first-child").attr("class", "midpoint");
- enter.append("polygon").attr("points", "-6,8 10,0 -6,-8").attr("class", "shadow");
- enter.append("polygon").attr("points", "-3,4 5,0 -3,-4").attr("class", "fill");
- groups = groups.merge(enter).attr("transform", function(d) {
- var translate = svgPointTransform(projection2);
- var a2 = graph.entity(d.edge[0]);
- var b2 = graph.entity(d.edge[1]);
- var angle2 = geoAngle(a2, b2, projection2) * (180 / Math.PI);
- return translate(d) + " rotate(" + angle2 + ")";
- }).call(svgTagClasses().tags(function(d) {
- return d.parents[0].tags;
- }));
- groups.select("polygon.shadow");
- groups.select("polygon.fill");
- touchLayer.call(drawTargets, graph, Object.values(midpoints), midpointFilter);
}
- return drawMidpoints;
+ function hideLayer() {
+ layer.transition().duration(250).style("opacity", 0).on("end", () => {
+ layer.selectAll(".viewfield-group").remove();
+ layer.style("display", "none");
+ });
+ }
+ drawPhotos.enabled = function(val) {
+ if (!arguments.length) return _enabled2;
+ _enabled2 = val;
+ if (_enabled2) {
+ showLayer();
+ } else {
+ hideLayer();
+ }
+ dispatch14.call("change");
+ return this;
+ };
+ drawPhotos.hasData = function() {
+ return isArray_default(_photos) && _photos.length > 0;
+ };
+ init2();
+ return drawPhotos;
}
- // modules/svg/points.js
- var import_fast_deep_equal7 = __toESM(require_fast_deep_equal());
- function svgPoints(projection2, context) {
+ // modules/svg/osmose.js
+ var _layerEnabled2 = false;
+ var _qaService2;
+ function svgOsmose(projection2, context, dispatch14) {
+ const throttledRedraw = throttle_default(() => dispatch14.call("change"), 1e3);
+ const minZoom5 = 12;
+ let touchLayer = select_default2(null);
+ let drawLayer = select_default2(null);
+ let layerVisible = false;
function markerPath(selection2, klass) {
- selection2.attr("class", klass).attr("transform", "translate(-8, -23)").attr("d", "M 17,8 C 17,13 11,21 8.5,23.5 C 6,21 0,13 0,8 C 0,4 4,-0.5 8.5,-0.5 C 13,-0.5 17,4 17,8 z");
+ selection2.attr("class", klass).attr("transform", "translate(-10, -28)").attr("points", "16,3 4,3 1,6 1,17 4,20 7,20 10,27 13,20 16,20 19,17.033 19,6");
}
- function sortY(a, b) {
- return b.loc[1] - a.loc[1];
+ function getService() {
+ if (services.osmose && !_qaService2) {
+ _qaService2 = services.osmose;
+ _qaService2.on("loaded", throttledRedraw);
+ } else if (!services.osmose && _qaService2) {
+ _qaService2 = null;
+ }
+ return _qaService2;
}
- function fastEntityKey(d) {
- var mode = context.mode();
- var isMoving = mode && /^(add|draw|drag|move|rotate)/.test(mode.id);
- return isMoving ? d.id : osmEntity.key(d);
+ function editOn() {
+ if (!layerVisible) {
+ layerVisible = true;
+ drawLayer.style("display", "block");
+ }
}
- function drawTargets(selection2, graph, entities, filter2) {
- var fillClass = context.getDebug("target") ? "pink " : "nocolor ";
- var getTransform = svgPointTransform(projection2).geojson;
- var activeID = context.activeID();
- var data = [];
- entities.forEach(function(node) {
- if (activeID === node.id)
- return;
- data.push({
- type: "Feature",
- id: node.id,
- properties: {
- target: true,
- entity: node
- },
- geometry: node.asGeoJSON()
- });
- });
- var targets = selection2.selectAll(".point.target").filter(function(d) {
- return filter2(d.properties.entity);
- }).data(data, function key(d) {
- return d.id;
+ function editOff() {
+ if (layerVisible) {
+ layerVisible = false;
+ drawLayer.style("display", "none");
+ drawLayer.selectAll(".qaItem.osmose").remove();
+ touchLayer.selectAll(".qaItem.osmose").remove();
+ }
+ }
+ function layerOn() {
+ editOn();
+ drawLayer.style("opacity", 0).transition().duration(250).style("opacity", 1).on("end interrupt", () => dispatch14.call("change"));
+ }
+ function layerOff() {
+ throttledRedraw.cancel();
+ drawLayer.interrupt();
+ touchLayer.selectAll(".qaItem.osmose").remove();
+ drawLayer.transition().duration(250).style("opacity", 0).on("end interrupt", () => {
+ editOff();
+ dispatch14.call("change");
});
+ }
+ function updateMarkers() {
+ if (!layerVisible || !_layerEnabled2) return;
+ const service = getService();
+ const selectedID = context.selectedErrorID();
+ const data = service ? service.getItems(projection2) : [];
+ const getTransform = svgPointTransform(projection2);
+ const markers = drawLayer.selectAll(".qaItem.osmose").data(data, (d2) => d2.id);
+ markers.exit().remove();
+ const markersEnter = markers.enter().append("g").attr("class", (d2) => "qaItem ".concat(d2.service, " itemId-").concat(d2.id, " itemType-").concat(d2.itemType));
+ markersEnter.append("polygon").call(markerPath, "shadow");
+ markersEnter.append("ellipse").attr("cx", 0).attr("cy", 0).attr("rx", 4.5).attr("ry", 2).attr("class", "stroke");
+ markersEnter.append("polygon").attr("fill", (d2) => service.getColor(d2.item)).call(markerPath, "qaItem-fill");
+ markersEnter.append("use").attr("class", "icon-annotation").attr("transform", "translate(-6, -22)").attr("width", "12px").attr("height", "12px").attr("xlink:href", (d2) => d2.icon ? "#" + d2.icon : "");
+ markers.merge(markersEnter).sort(sortY).classed("selected", (d2) => d2.id === selectedID).attr("transform", getTransform);
+ if (touchLayer.empty()) return;
+ const fillClass = context.getDebug("target") ? "pink" : "nocolor";
+ const targets = touchLayer.selectAll(".qaItem.osmose").data(data, (d2) => d2.id);
targets.exit().remove();
- targets.enter().append("rect").attr("x", -10).attr("y", -26).attr("width", 20).attr("height", 30).merge(targets).attr("class", function(d) {
- return "node point target " + fillClass + d.id;
- }).attr("transform", getTransform);
+ targets.enter().append("rect").attr("width", "20px").attr("height", "30px").attr("x", "-10px").attr("y", "-28px").merge(targets).sort(sortY).attr("class", (d2) => "qaItem ".concat(d2.service, " target ").concat(fillClass, " itemId-").concat(d2.id)).attr("transform", getTransform);
+ function sortY(a2, b2) {
+ return a2.id === selectedID ? 1 : b2.id === selectedID ? -1 : b2.loc[1] - a2.loc[1];
+ }
}
- function drawPoints(selection2, graph, entities, filter2) {
- var wireframe = context.surface().classed("fill-wireframe");
- var zoom = geoScaleToZoom(projection2.scale());
- var base = context.history().base();
- function renderAsPoint(entity) {
- return entity.geometry(graph) === "point" && !(zoom >= 18 && entity.directions(graph, projection2).length);
+ function drawOsmose(selection2) {
+ const service = getService();
+ const surface = context.surface();
+ if (surface && !surface.empty()) {
+ touchLayer = surface.selectAll(".data-layer.touch .layer-touch.markers");
+ }
+ drawLayer = selection2.selectAll(".layer-osmose").data(service ? [0] : []);
+ drawLayer.exit().remove();
+ drawLayer = drawLayer.enter().append("g").attr("class", "layer-osmose").style("display", _layerEnabled2 ? "block" : "none").merge(drawLayer);
+ if (_layerEnabled2) {
+ if (service && ~~context.map().zoom() >= minZoom5) {
+ editOn();
+ service.loadIssues(projection2);
+ updateMarkers();
+ } else {
+ editOff();
+ }
}
- var points = wireframe ? [] : entities.filter(renderAsPoint);
- points.sort(sortY);
- var drawLayer = selection2.selectAll(".layer-osm.points .points-group.points");
- var touchLayer = selection2.selectAll(".layer-touch.points");
- var groups = drawLayer.selectAll("g.point").filter(filter2).data(points, fastEntityKey);
- groups.exit().remove();
- var enter = groups.enter().append("g").attr("class", function(d) {
- return "node point " + d.id;
- }).order();
- enter.append("path").call(markerPath, "shadow");
- enter.append("ellipse").attr("cx", 0.5).attr("cy", 1).attr("rx", 6.5).attr("ry", 3).attr("class", "stroke");
- enter.append("path").call(markerPath, "stroke");
- enter.append("use").attr("transform", "translate(-5.5, -20)").attr("class", "icon").attr("width", "12px").attr("height", "12px");
- groups = groups.merge(enter).attr("transform", svgPointTransform(projection2)).classed("added", function(d) {
- return !base.entities[d.id];
- }).classed("moved", function(d) {
- return base.entities[d.id] && !(0, import_fast_deep_equal7.default)(graph.entities[d.id].loc, base.entities[d.id].loc);
- }).classed("retagged", function(d) {
- return base.entities[d.id] && !(0, import_fast_deep_equal7.default)(graph.entities[d.id].tags, base.entities[d.id].tags);
- }).call(svgTagClasses());
- groups.select(".shadow");
- groups.select(".stroke");
- groups.select(".icon").attr("xlink:href", function(entity) {
- var preset = _mainPresetIndex.match(entity, graph);
- var picon = preset && preset.icon;
- return picon ? "#" + picon : "";
- });
- touchLayer.call(drawTargets, graph, points, filter2);
}
- return drawPoints;
+ drawOsmose.enabled = function(val) {
+ if (!arguments.length) return _layerEnabled2;
+ _layerEnabled2 = val;
+ if (_layerEnabled2) {
+ getService().loadStrings().then(layerOn).catch((err) => {
+ console.log(err);
+ });
+ } else {
+ layerOff();
+ if (context.selectedErrorID()) {
+ context.enter(modeBrowse(context));
+ }
+ }
+ dispatch14.call("change");
+ return this;
+ };
+ drawOsmose.supported = () => !!getService();
+ return drawOsmose;
}
- // modules/svg/turns.js
- function svgTurns(projection2, context) {
- function icon2(turn) {
- var u = turn.u ? "-u" : "";
- if (turn.no)
- return "#iD-turn-no" + u;
- if (turn.only)
- return "#iD-turn-only" + u;
- return "#iD-turn-yes" + u;
+ // modules/svg/streetside.js
+ function svgStreetside(projection2, context, dispatch14) {
+ var throttledRedraw = throttle_default(function() {
+ dispatch14.call("change");
+ }, 1e3);
+ var minZoom5 = 14;
+ var minMarkerZoom = 16;
+ var minViewfieldZoom2 = 18;
+ var layer = select_default2(null);
+ var _viewerYaw = 0;
+ var _selectedSequence = null;
+ var _streetside;
+ function init2() {
+ if (svgStreetside.initialized) return;
+ svgStreetside.enabled = false;
+ svgStreetside.initialized = true;
}
- function drawTurns(selection2, graph, turns) {
- function turnTransform(d) {
- var pxRadius = 50;
- var toWay = graph.entity(d.to.way);
- var toPoints = graph.childNodes(toWay).map(function(n2) {
- return n2.loc;
- }).map(projection2);
- var toLength = geoPathLength(toPoints);
- var mid = toLength / 2;
- var toNode = graph.entity(d.to.node);
- var toVertex = graph.entity(d.to.vertex);
- var a = geoAngle(toVertex, toNode, projection2);
- var o = projection2(toVertex.loc);
- var r = d.u ? 0 : !toWay.__via ? pxRadius : Math.min(mid, pxRadius);
- return "translate(" + (r * Math.cos(a) + o[0]) + "," + (r * Math.sin(a) + o[1]) + ") rotate(" + a * 180 / Math.PI + ")";
+ function getService() {
+ if (services.streetside && !_streetside) {
+ _streetside = services.streetside;
+ _streetside.event.on("viewerChanged.svgStreetside", viewerChanged).on("loadedImages.svgStreetside", throttledRedraw);
+ } else if (!services.streetside && _streetside) {
+ _streetside = null;
}
- var drawLayer = selection2.selectAll(".layer-osm.points .points-group.turns");
- var touchLayer = selection2.selectAll(".layer-touch.turns");
- var groups = drawLayer.selectAll("g.turn").data(turns, function(d) {
- return d.key;
- });
- groups.exit().remove();
- var groupsEnter = groups.enter().append("g").attr("class", function(d) {
- return "turn " + d.key;
- });
- var turnsEnter = groupsEnter.filter(function(d) {
- return !d.u;
- });
- turnsEnter.append("rect").attr("transform", "translate(-22, -12)").attr("width", "44").attr("height", "24");
- turnsEnter.append("use").attr("transform", "translate(-22, -12)").attr("width", "44").attr("height", "24");
- var uEnter = groupsEnter.filter(function(d) {
- return d.u;
- });
- uEnter.append("circle").attr("r", "16");
- uEnter.append("use").attr("transform", "translate(-16, -16)").attr("width", "32").attr("height", "32");
- groups = groups.merge(groupsEnter).attr("opacity", function(d) {
- return d.direct === false ? "0.7" : null;
- }).attr("transform", turnTransform);
- groups.select("use").attr("xlink:href", icon2);
- groups.select("rect");
- groups.select("circle");
- var fillClass = context.getDebug("target") ? "pink " : "nocolor ";
- groups = touchLayer.selectAll("g.turn").data(turns, function(d) {
- return d.key;
- });
- groups.exit().remove();
- groupsEnter = groups.enter().append("g").attr("class", function(d) {
- return "turn " + d.key;
- });
- turnsEnter = groupsEnter.filter(function(d) {
- return !d.u;
+ return _streetside;
+ }
+ function showLayer() {
+ var service = getService();
+ if (!service) return;
+ editOn();
+ layer.style("opacity", 0).transition().duration(250).style("opacity", 1).on("end", function() {
+ dispatch14.call("change");
});
- turnsEnter.append("rect").attr("class", "target " + fillClass).attr("transform", "translate(-22, -12)").attr("width", "44").attr("height", "24");
- uEnter = groupsEnter.filter(function(d) {
- return d.u;
+ }
+ function hideLayer() {
+ throttledRedraw.cancel();
+ layer.transition().duration(250).style("opacity", 0).on("end", editOff);
+ }
+ function editOn() {
+ layer.style("display", "block");
+ }
+ function editOff() {
+ layer.selectAll(".viewfield-group").remove();
+ layer.style("display", "none");
+ }
+ function click(d3_event, d2) {
+ var service = getService();
+ if (!service) return;
+ if (d2.sequenceKey !== _selectedSequence) {
+ _viewerYaw = 0;
+ }
+ _selectedSequence = d2.sequenceKey;
+ service.ensureViewerLoaded(context).then(function() {
+ service.selectImage(context, d2.key).yaw(_viewerYaw).showViewer(context);
});
- uEnter.append("circle").attr("class", "target " + fillClass).attr("r", "16");
- groups = groups.merge(groupsEnter).attr("transform", turnTransform);
- groups.select("rect");
- groups.select("circle");
- return this;
+ context.map().centerEase(d2.loc);
}
- return drawTurns;
- }
-
- // modules/svg/vertices.js
- var import_fast_deep_equal8 = __toESM(require_fast_deep_equal());
- function svgVertices(projection2, context) {
- var radiuses = {
- shadow: [6, 7.5, 7.5, 12],
- stroke: [2.5, 3.5, 3.5, 8],
- fill: [1, 1.5, 1.5, 1.5]
- };
- var _currHoverTarget;
- var _currPersistent = {};
- var _currHover = {};
- var _prevHover = {};
- var _currSelected = {};
- var _prevSelected = {};
- var _radii = {};
- function sortY(a, b) {
- return b.loc[1] - a.loc[1];
+ function mouseover(d3_event, d2) {
+ var service = getService();
+ if (service) service.setStyles(context, d2);
}
- function fastEntityKey(d) {
- var mode = context.mode();
- var isMoving = mode && /^(add|draw|drag|move|rotate)/.test(mode.id);
- return isMoving ? d.id : osmEntity.key(d);
+ function mouseout() {
+ var service = getService();
+ if (service) service.setStyles(context, null);
}
- function draw(selection2, graph, vertices, sets2, filter2) {
- sets2 = sets2 || { selected: {}, important: {}, hovered: {} };
- var icons = {};
- var directions = {};
- var wireframe = context.surface().classed("fill-wireframe");
- var zoom = geoScaleToZoom(projection2.scale());
- var z = zoom < 17 ? 0 : zoom < 18 ? 1 : 2;
- var activeID = context.activeID();
- var base = context.history().base();
- function getIcon(d) {
- var entity = graph.entity(d.id);
- if (entity.id in icons)
- return icons[entity.id];
- icons[entity.id] = entity.hasInterestingTags() && _mainPresetIndex.match(entity, graph).icon;
- return icons[entity.id];
+ function transform2(d2) {
+ var t2 = svgPointTransform(projection2)(d2);
+ var rot = d2.ca + _viewerYaw;
+ if (rot) {
+ t2 += " rotate(" + Math.floor(rot) + ",0,0)";
}
- function getDirections(entity) {
- if (entity.id in directions)
- return directions[entity.id];
- var angles = entity.directions(graph, projection2);
- directions[entity.id] = angles.length ? angles : false;
- return angles;
+ return t2;
+ }
+ function viewerChanged() {
+ var service = getService();
+ if (!service) return;
+ var viewer = service.viewer();
+ if (!viewer) return;
+ _viewerYaw = viewer.getYaw();
+ if (context.map().isTransformed()) return;
+ layer.selectAll(".viewfield-group.currentView").attr("transform", transform2);
+ }
+ function filterBubbles(bubbles) {
+ var fromDate = context.photos().fromDate();
+ var toDate = context.photos().toDate();
+ var usernames = context.photos().usernames();
+ if (fromDate) {
+ var fromTimestamp = new Date(fromDate).getTime();
+ bubbles = bubbles.filter(function(bubble) {
+ return new Date(bubble.captured_at).getTime() >= fromTimestamp;
+ });
}
- function updateAttributes(selection3) {
- ["shadow", "stroke", "fill"].forEach(function(klass) {
- var rads = radiuses[klass];
- selection3.selectAll("." + klass).each(function(entity) {
- var i2 = z && getIcon(entity);
- var r = rads[i2 ? 3 : z];
- if (entity.id !== activeID && entity.isEndpoint(graph) && !entity.isConnected(graph)) {
- r += 1.5;
- }
- if (klass === "shadow") {
- _radii[entity.id] = r;
- }
- select_default2(this).attr("r", r).attr("visibility", i2 && klass === "fill" ? "hidden" : null);
- });
+ if (toDate) {
+ var toTimestamp = new Date(toDate).getTime();
+ bubbles = bubbles.filter(function(bubble) {
+ return new Date(bubble.captured_at).getTime() <= toTimestamp;
});
}
- vertices.sort(sortY);
- var groups = selection2.selectAll("g.vertex").filter(filter2).data(vertices, fastEntityKey);
- groups.exit().remove();
- var enter = groups.enter().append("g").attr("class", function(d) {
- return "node vertex " + d.id;
- }).order();
- enter.append("circle").attr("class", "shadow");
- enter.append("circle").attr("class", "stroke");
- enter.filter(function(d) {
- return d.hasInterestingTags();
- }).append("circle").attr("class", "fill");
- groups = groups.merge(enter).attr("transform", svgPointTransform(projection2)).classed("sibling", function(d) {
- return d.id in sets2.selected;
- }).classed("shared", function(d) {
- return graph.isShared(d);
- }).classed("endpoint", function(d) {
- return d.isEndpoint(graph);
- }).classed("added", function(d) {
- return !base.entities[d.id];
- }).classed("moved", function(d) {
- return base.entities[d.id] && !(0, import_fast_deep_equal8.default)(graph.entities[d.id].loc, base.entities[d.id].loc);
- }).classed("retagged", function(d) {
- return base.entities[d.id] && !(0, import_fast_deep_equal8.default)(graph.entities[d.id].tags, base.entities[d.id].tags);
- }).call(updateAttributes);
- var iconUse = groups.selectAll(".icon").data(function data(d) {
- return zoom >= 17 && getIcon(d) ? [d] : [];
- }, fastEntityKey);
- iconUse.exit().remove();
- iconUse.enter().append("use").attr("class", "icon").attr("width", "12px").attr("height", "12px").attr("transform", "translate(-6, -6)").attr("xlink:href", function(d) {
- var picon = getIcon(d);
- return picon ? "#" + picon : "";
+ if (usernames) {
+ bubbles = bubbles.filter(function(bubble) {
+ return usernames.indexOf(bubble.captured_by) !== -1;
+ });
+ }
+ return bubbles;
+ }
+ function filterSequences(sequences) {
+ var fromDate = context.photos().fromDate();
+ var toDate = context.photos().toDate();
+ var usernames = context.photos().usernames();
+ if (fromDate) {
+ var fromTimestamp = new Date(fromDate).getTime();
+ sequences = sequences.filter(function(sequences2) {
+ return new Date(sequences2.properties.captured_at).getTime() >= fromTimestamp;
+ });
+ }
+ if (toDate) {
+ var toTimestamp = new Date(toDate).getTime();
+ sequences = sequences.filter(function(sequences2) {
+ return new Date(sequences2.properties.captured_at).getTime() <= toTimestamp;
+ });
+ }
+ if (usernames) {
+ sequences = sequences.filter(function(sequences2) {
+ return usernames.indexOf(sequences2.properties.captured_by) !== -1;
+ });
+ }
+ return sequences;
+ }
+ function update() {
+ var viewer = context.container().select(".photoviewer");
+ var selected = viewer.empty() ? void 0 : viewer.datum();
+ var z2 = ~~context.map().zoom();
+ var showMarkers = z2 >= minMarkerZoom;
+ var showViewfields = z2 >= minViewfieldZoom2;
+ var service = getService();
+ var sequences = [];
+ var bubbles = [];
+ if (context.photos().showsPanoramic()) {
+ sequences = service ? service.sequences(projection2) : [];
+ bubbles = service && showMarkers ? service.bubbles(projection2) : [];
+ sequences = filterSequences(sequences);
+ bubbles = filterBubbles(bubbles);
+ }
+ var traces = layer.selectAll(".sequences").selectAll(".sequence").data(sequences, function(d2) {
+ return d2.properties.key;
});
- var dgroups = groups.selectAll(".viewfieldgroup").data(function data(d) {
- return zoom >= 18 && getDirections(d) ? [d] : [];
- }, fastEntityKey);
- dgroups.exit().remove();
- dgroups = dgroups.enter().insert("g", ".shadow").attr("class", "viewfieldgroup").merge(dgroups);
- var viewfields = dgroups.selectAll(".viewfield").data(getDirections, function key(d) {
- return osmEntity.key(d);
+ traces.exit().remove();
+ traces = traces.enter().append("path").attr("class", "sequence").merge(traces).attr("d", svgPath(projection2).geojson);
+ var groups = layer.selectAll(".markers").selectAll(".viewfield-group").data(bubbles, function(d2) {
+ return d2.key + (d2.sequenceKey ? "v1" : "v0");
});
+ groups.exit().remove();
+ var groupsEnter = groups.enter().append("g").attr("class", "viewfield-group").on("mouseenter", mouseover).on("mouseleave", mouseout).on("click", click);
+ groupsEnter.append("g").attr("class", "viewfield-scale");
+ var markers = groups.merge(groupsEnter).sort(function(a2, b2) {
+ return a2 === selected ? 1 : b2 === selected ? -1 : b2.loc[1] - a2.loc[1];
+ }).attr("transform", transform2).select(".viewfield-scale");
+ markers.selectAll("circle").data([0]).enter().append("circle").attr("dx", "0").attr("dy", "0").attr("r", "6");
+ var viewfields = markers.selectAll(".viewfield").data(showViewfields ? [0] : []);
viewfields.exit().remove();
- viewfields.enter().append("path").attr("class", "viewfield").attr("d", "M0,0H0").merge(viewfields).attr("marker-start", "url(#ideditor-viewfield-marker" + (wireframe ? "-wireframe" : "") + ")").attr("transform", function(d) {
- return "rotate(" + d + ")";
- });
+ viewfields.enter().insert("path", "circle").attr("class", "viewfield").attr("transform", "scale(1.5,1.5),translate(-8, -13)").attr("d", viewfieldPath);
+ function viewfieldPath() {
+ var d2 = this.parentNode.__data__;
+ if (d2.pano) {
+ return "M 8,13 m -10,0 a 10,10 0 1,0 20,0 a 10,10 0 1,0 -20,0";
+ } else {
+ return "M 6,9 C 8,8.4 8,8.4 10,9 L 16,-2 C 12,-5 4,-5 0,-2 z";
+ }
+ }
}
- function drawTargets(selection2, graph, entities, filter2) {
- var targetClass = context.getDebug("target") ? "pink " : "nocolor ";
- var nopeClass = context.getDebug("target") ? "red " : "nocolor ";
- var getTransform = svgPointTransform(projection2).geojson;
- var activeID = context.activeID();
- var data = { targets: [], nopes: [] };
- entities.forEach(function(node) {
- if (activeID === node.id)
- return;
- var vertexType = svgPassiveVertex(node, graph, activeID);
- if (vertexType !== 0) {
- data.targets.push({
- type: "Feature",
- id: node.id,
- properties: {
- target: true,
- entity: node
- },
- geometry: node.asGeoJSON()
- });
+ function drawImages(selection2) {
+ var enabled = svgStreetside.enabled;
+ var service = getService();
+ layer = selection2.selectAll(".layer-streetside-images").data(service ? [0] : []);
+ layer.exit().remove();
+ var layerEnter = layer.enter().append("g").attr("class", "layer-streetside-images").style("display", enabled ? "block" : "none");
+ layerEnter.append("g").attr("class", "sequences");
+ layerEnter.append("g").attr("class", "markers");
+ layer = layerEnter.merge(layer);
+ if (enabled) {
+ if (service && ~~context.map().zoom() >= minZoom5) {
+ editOn();
+ update();
+ service.loadBubbles(projection2);
} else {
- data.nopes.push({
- type: "Feature",
- id: node.id + "-nope",
- properties: {
- nope: true,
- target: true,
- entity: node
- },
- geometry: node.asGeoJSON()
- });
+ editOff();
}
+ }
+ }
+ drawImages.enabled = function(_2) {
+ if (!arguments.length) return svgStreetside.enabled;
+ svgStreetside.enabled = _2;
+ if (svgStreetside.enabled) {
+ showLayer();
+ context.photos().on("change.streetside", update);
+ } else {
+ hideLayer();
+ context.photos().on("change.streetside", null);
+ }
+ dispatch14.call("change");
+ return this;
+ };
+ drawImages.supported = function() {
+ return !!getService();
+ };
+ drawImages.rendered = function(zoom) {
+ return zoom >= minZoom5;
+ };
+ init2();
+ return drawImages;
+ }
+
+ // modules/svg/vegbilder.js
+ function svgVegbilder(projection2, context, dispatch14) {
+ const throttledRedraw = throttle_default(() => dispatch14.call("change"), 1e3);
+ const minZoom5 = 14;
+ const minMarkerZoom = 16;
+ const minViewfieldZoom2 = 18;
+ let layer = select_default2(null);
+ let _viewerYaw = 0;
+ let _vegbilder;
+ function init2() {
+ if (svgVegbilder.initialized) return;
+ svgVegbilder.enabled = false;
+ svgVegbilder.initialized = true;
+ }
+ function getService() {
+ if (services.vegbilder && !_vegbilder) {
+ _vegbilder = services.vegbilder;
+ _vegbilder.event.on("viewerChanged.svgVegbilder", viewerChanged).on("loadedImages.svgVegbilder", throttledRedraw);
+ } else if (!services.vegbilder && _vegbilder) {
+ _vegbilder = null;
+ }
+ return _vegbilder;
+ }
+ function showLayer() {
+ const service = getService();
+ if (!service) return;
+ editOn();
+ layer.style("opacity", 0).transition().duration(250).style("opacity", 1).on("end", () => dispatch14.call("change"));
+ }
+ function hideLayer() {
+ throttledRedraw.cancel();
+ layer.transition().duration(250).style("opacity", 0).on("end", editOff);
+ }
+ function editOn() {
+ layer.style("display", "block");
+ }
+ function editOff() {
+ layer.selectAll(".viewfield-group").remove();
+ layer.style("display", "none");
+ }
+ function click(d3_event, d2) {
+ const service = getService();
+ if (!service) return;
+ service.ensureViewerLoaded(context).then(() => {
+ service.selectImage(context, d2.key).showViewer(context);
});
- var targets = selection2.selectAll(".vertex.target-allowed").filter(function(d) {
- return filter2(d.properties.entity);
- }).data(data.targets, function key(d) {
- return d.id;
- });
- targets.exit().remove();
- targets.enter().append("circle").attr("r", function(d) {
- return _radii[d.id] || radiuses.shadow[3];
- }).merge(targets).attr("class", function(d) {
- return "node vertex target target-allowed " + targetClass + d.id;
- }).attr("transform", getTransform);
- var nopes = selection2.selectAll(".vertex.target-nope").filter(function(d) {
- return filter2(d.properties.entity);
- }).data(data.nopes, function key(d) {
- return d.id;
- });
- nopes.exit().remove();
- nopes.enter().append("circle").attr("r", function(d) {
- return _radii[d.properties.entity.id] || radiuses.shadow[3];
- }).merge(nopes).attr("class", function(d) {
- return "node vertex target target-nope " + nopeClass + d.id;
- }).attr("transform", getTransform);
+ context.map().centerEase(d2.loc);
}
- function renderAsVertex(entity, graph, wireframe, zoom) {
- var geometry = entity.geometry(graph);
- return geometry === "vertex" || geometry === "point" && (wireframe || zoom >= 18 && entity.directions(graph, projection2).length);
+ function mouseover(d3_event, d2) {
+ const service = getService();
+ if (service) service.setStyles(context, d2);
}
- function isEditedNode(node, base, head) {
- var baseNode = base.entities[node.id];
- var headNode = head.entities[node.id];
- return !headNode || !baseNode || !(0, import_fast_deep_equal8.default)(headNode.tags, baseNode.tags) || !(0, import_fast_deep_equal8.default)(headNode.loc, baseNode.loc);
+ function mouseout() {
+ const service = getService();
+ if (service) service.setStyles(context, null);
}
- function getSiblingAndChildVertices(ids, graph, wireframe, zoom) {
- var results = {};
- var seenIds = {};
- function addChildVertices(entity) {
- if (seenIds[entity.id])
- return;
- seenIds[entity.id] = true;
- var geometry = entity.geometry(graph);
- if (!context.features().isHiddenFeature(entity, graph, geometry)) {
- var i2;
- if (entity.type === "way") {
- for (i2 = 0; i2 < entity.nodes.length; i2++) {
- var child = graph.hasEntity(entity.nodes[i2]);
- if (child) {
- addChildVertices(child);
- }
- }
- } else if (entity.type === "relation") {
- for (i2 = 0; i2 < entity.members.length; i2++) {
- var member = graph.hasEntity(entity.members[i2].id);
- if (member) {
- addChildVertices(member);
- }
- }
- } else if (renderAsVertex(entity, graph, wireframe, zoom)) {
- results[entity.id] = entity;
- }
- }
+ function transform2(d2, selected) {
+ let t2 = svgPointTransform(projection2)(d2);
+ let rot = d2.ca;
+ if (d2 === selected) {
+ rot += _viewerYaw;
}
- ids.forEach(function(id2) {
- var entity = graph.hasEntity(id2);
- if (!entity)
- return;
- if (entity.type === "node") {
- if (renderAsVertex(entity, graph, wireframe, zoom)) {
- results[entity.id] = entity;
- graph.parentWays(entity).forEach(function(entity2) {
- addChildVertices(entity2);
- });
- }
- } else {
- addChildVertices(entity);
- }
- });
- return results;
+ if (rot) {
+ t2 += " rotate(" + Math.floor(rot) + ",0,0)";
+ }
+ return t2;
}
- function drawVertices(selection2, graph, entities, filter2, extent, fullRedraw) {
- var wireframe = context.surface().classed("fill-wireframe");
- var visualDiff = context.surface().classed("highlight-edited");
- var zoom = geoScaleToZoom(projection2.scale());
- var mode = context.mode();
- var isMoving = mode && /^(add|draw|drag|move|rotate)/.test(mode.id);
- var base = context.history().base();
- var drawLayer = selection2.selectAll(".layer-osm.points .points-group.vertices");
- var touchLayer = selection2.selectAll(".layer-touch.points");
- if (fullRedraw) {
- _currPersistent = {};
- _radii = {};
+ function viewerChanged() {
+ const service = getService();
+ if (!service) return;
+ const frame2 = service.photoFrame();
+ _viewerYaw = frame2.getYaw();
+ if (context.map().isTransformed()) return;
+ layer.selectAll(".viewfield-group.currentView").attr("transform", (d2) => transform2(d2, d2));
+ }
+ function filterImages(images) {
+ const photoContext = context.photos();
+ const fromDateString = photoContext.fromDate();
+ const toDateString = photoContext.toDate();
+ const showsFlat = photoContext.showsFlat();
+ const showsPano = photoContext.showsPanoramic();
+ if (fromDateString) {
+ const fromDate = new Date(fromDateString);
+ images = images.filter((image) => image.captured_at.getTime() >= fromDate.getTime());
}
- for (var i2 = 0; i2 < entities.length; i2++) {
- var entity = entities[i2];
- var geometry = entity.geometry(graph);
- var keep = false;
- if (geometry === "point" && renderAsVertex(entity, graph, wireframe, zoom)) {
- _currPersistent[entity.id] = entity;
- keep = true;
- } else if (geometry === "vertex" && (entity.hasInterestingTags() || entity.isEndpoint(graph) || entity.isConnected(graph) || visualDiff && isEditedNode(entity, base, graph))) {
- _currPersistent[entity.id] = entity;
- keep = true;
- }
- if (!keep && !fullRedraw) {
- delete _currPersistent[entity.id];
- }
+ if (toDateString) {
+ const toDate = new Date(toDateString);
+ images = images.filter((image) => image.captured_at.getTime() <= toDate.getTime());
}
- var sets2 = {
- persistent: _currPersistent,
- selected: _currSelected,
- hovered: _currHover
- };
- var all = Object.assign({}, isMoving ? _currHover : {}, _currSelected, _currPersistent);
- var filterRendered = function(d) {
- return d.id in _currPersistent || d.id in _currSelected || d.id in _currHover || filter2(d);
- };
- drawLayer.call(draw, graph, currentVisible(all), sets2, filterRendered);
- var filterTouch = function(d) {
- return isMoving ? true : filterRendered(d);
- };
- touchLayer.call(drawTargets, graph, currentVisible(all), filterTouch);
- function currentVisible(which) {
- return Object.keys(which).map(graph.hasEntity, graph).filter(function(entity2) {
- return entity2 && entity2.intersects(extent, graph);
- });
+ if (!showsPano) {
+ images = images.filter((image) => !image.is_sphere);
+ }
+ if (!showsFlat) {
+ images = images.filter((image) => image.is_sphere);
}
+ return images;
}
- drawVertices.drawSelected = function(selection2, graph, extent) {
- var wireframe = context.surface().classed("fill-wireframe");
- var zoom = geoScaleToZoom(projection2.scale());
- _prevSelected = _currSelected || {};
- if (context.map().isInWideSelection()) {
- _currSelected = {};
- context.selectedIDs().forEach(function(id2) {
- var entity = graph.hasEntity(id2);
- if (!entity)
- return;
- if (entity.type === "node") {
- if (renderAsVertex(entity, graph, wireframe, zoom)) {
- _currSelected[entity.id] = entity;
- }
- }
- });
- } else {
- _currSelected = getSiblingAndChildVertices(context.selectedIDs(), graph, wireframe, zoom);
+ function filterSequences(sequences) {
+ const photoContext = context.photos();
+ const fromDateString = photoContext.fromDate();
+ const toDateString = photoContext.toDate();
+ const showsFlat = photoContext.showsFlat();
+ const showsPano = photoContext.showsPanoramic();
+ if (fromDateString) {
+ const fromDate = new Date(fromDateString);
+ sequences = sequences.filter(({ images }) => images[0].captured_at.getTime() >= fromDate.getTime());
}
- var filter2 = function(d) {
- return d.id in _prevSelected;
- };
- drawVertices(selection2, graph, Object.values(_prevSelected), filter2, extent, false);
- };
- drawVertices.drawHover = function(selection2, graph, target, extent) {
- if (target === _currHoverTarget)
- return;
- var wireframe = context.surface().classed("fill-wireframe");
- var zoom = geoScaleToZoom(projection2.scale());
- _prevHover = _currHover || {};
- _currHoverTarget = target;
- var entity = target && target.properties && target.properties.entity;
- if (entity) {
- _currHover = getSiblingAndChildVertices([entity.id], graph, wireframe, zoom);
- } else {
- _currHover = {};
+ if (toDateString) {
+ const toDate = new Date(toDateString);
+ sequences = sequences.filter(({ images }) => images[images.length - 1].captured_at.getTime() <= toDate.getTime());
}
- var filter2 = function(d) {
- return d.id in _prevHover;
- };
- drawVertices(selection2, graph, Object.values(_prevHover), filter2, extent, false);
- };
- return drawVertices;
- }
-
- // modules/util/bind_once.js
- function utilBindOnce(target, type3, listener, capture) {
- var typeOnce = type3 + ".once";
- function one2() {
- target.on(typeOnce, null);
- listener.apply(this, arguments);
+ if (!showsPano) {
+ sequences = sequences.filter(({ images }) => !images[0].is_sphere);
+ }
+ if (!showsFlat) {
+ sequences = sequences.filter(({ images }) => images[0].is_sphere);
+ }
+ return sequences;
}
- target.on(typeOnce, one2, capture);
- return this;
- }
-
- // modules/util/zoom_pan.js
- function defaultFilter3(d3_event) {
- return !d3_event.ctrlKey && !d3_event.button;
- }
- function defaultExtent2() {
- var e = this;
- if (e instanceof SVGElement) {
- e = e.ownerSVGElement || e;
- if (e.hasAttribute("viewBox")) {
- e = e.viewBox.baseVal;
- return [[e.x, e.y], [e.x + e.width, e.y + e.height]];
+ function update() {
+ const viewer = context.container().select(".photoviewer");
+ const selected = viewer.empty() ? void 0 : viewer.datum();
+ const z2 = ~~context.map().zoom();
+ const showMarkers = z2 >= minMarkerZoom;
+ const showViewfields = z2 >= minViewfieldZoom2;
+ const service = getService();
+ let sequences = [];
+ let images = [];
+ if (service) {
+ service.loadImages(context);
+ sequences = service.sequences(projection2);
+ images = showMarkers ? service.images(projection2) : [];
+ images = filterImages(images);
+ sequences = filterSequences(sequences);
+ }
+ let traces = layer.selectAll(".sequences").selectAll(".sequence").data(sequences, (d2) => d2.key);
+ traces.exit().remove();
+ traces.enter().append("path").attr("class", "sequence").merge(traces).attr("d", svgPath(projection2).geojson);
+ const groups = layer.selectAll(".markers").selectAll(".viewfield-group").data(images, (d2) => d2.key);
+ groups.exit().remove();
+ const groupsEnter = groups.enter().append("g").attr("class", "viewfield-group").on("mouseenter", mouseover).on("mouseleave", mouseout).on("click", click);
+ groupsEnter.append("g").attr("class", "viewfield-scale");
+ const markers = groups.merge(groupsEnter).sort((a2, b2) => {
+ return a2 === selected ? 1 : b2 === selected ? -1 : b2.loc[1] - a2.loc[1];
+ }).attr("transform", (d2) => transform2(d2, selected)).select(".viewfield-scale");
+ markers.selectAll("circle").data([0]).enter().append("circle").attr("dx", "0").attr("dy", "0").attr("r", "6");
+ const viewfields = markers.selectAll(".viewfield").data(showViewfields ? [0] : []);
+ viewfields.exit().remove();
+ viewfields.enter().insert("path", "circle").attr("class", "viewfield").attr("transform", "scale(1.5,1.5),translate(-8, -13)").attr("d", viewfieldPath);
+ function viewfieldPath() {
+ const d2 = this.parentNode.__data__;
+ if (d2.is_sphere) {
+ return "M 8,13 m -10,0 a 10,10 0 1,0 20,0 a 10,10 0 1,0 -20,0";
+ } else {
+ return "M 6,9 C 8,8.4 8,8.4 10,9 L 16,-2 C 12,-5 4,-5 0,-2 z";
+ }
}
- return [[0, 0], [e.width.baseVal.value, e.height.baseVal.value]];
}
- return [[0, 0], [e.clientWidth, e.clientHeight]];
- }
- function defaultWheelDelta2(d3_event) {
- return -d3_event.deltaY * (d3_event.deltaMode === 1 ? 0.05 : d3_event.deltaMode ? 1 : 2e-3);
- }
- function defaultConstrain2(transform2, extent, translateExtent) {
- var dx0 = transform2.invertX(extent[0][0]) - translateExtent[0][0], dx1 = transform2.invertX(extent[1][0]) - translateExtent[1][0], dy0 = transform2.invertY(extent[0][1]) - translateExtent[0][1], dy1 = transform2.invertY(extent[1][1]) - translateExtent[1][1];
- return transform2.translate(dx1 > dx0 ? (dx0 + dx1) / 2 : Math.min(0, dx0) || Math.max(0, dx1), dy1 > dy0 ? (dy0 + dy1) / 2 : Math.min(0, dy0) || Math.max(0, dy1));
- }
- function utilZoomPan() {
- var filter2 = defaultFilter3, extent = defaultExtent2, constrain = defaultConstrain2, wheelDelta = defaultWheelDelta2, scaleExtent = [0, Infinity], translateExtent = [[-Infinity, -Infinity], [Infinity, Infinity]], interpolate = zoom_default, dispatch10 = dispatch_default("start", "zoom", "end"), _wheelDelay = 150, _transform = identity2, _activeGesture;
- function zoom(selection2) {
- selection2.on("pointerdown.zoom", pointerdown).on("wheel.zoom", wheeled).style("touch-action", "none").style("-webkit-tap-highlight-color", "rgba(0,0,0,0)");
- select_default2(window).on("pointermove.zoompan", pointermove).on("pointerup.zoompan pointercancel.zoompan", pointerup);
+ function drawImages(selection2) {
+ const enabled = svgVegbilder.enabled;
+ const service = getService();
+ layer = selection2.selectAll(".layer-vegbilder").data(service ? [0] : []);
+ layer.exit().remove();
+ const layerEnter = layer.enter().append("g").attr("class", "layer-vegbilder").style("display", enabled ? "block" : "none");
+ layerEnter.append("g").attr("class", "sequences");
+ layerEnter.append("g").attr("class", "markers");
+ layer = layerEnter.merge(layer);
+ if (enabled) {
+ if (service && ~~context.map().zoom() >= minZoom5) {
+ editOn();
+ update();
+ service.loadImages(context);
+ } else {
+ editOff();
+ }
+ }
}
- zoom.transform = function(collection, transform2, point) {
- var selection2 = collection.selection ? collection.selection() : collection;
- if (collection !== selection2) {
- schedule(collection, transform2, point);
+ drawImages.enabled = function(_2) {
+ if (!arguments.length) return svgVegbilder.enabled;
+ svgVegbilder.enabled = _2;
+ if (svgVegbilder.enabled) {
+ showLayer();
+ context.photos().on("change.vegbilder", update);
} else {
- selection2.interrupt().each(function() {
- gesture(this, arguments).start(null).zoom(null, null, typeof transform2 === "function" ? transform2.apply(this, arguments) : transform2).end(null);
- });
+ hideLayer();
+ context.photos().on("change.vegbilder", null);
}
+ dispatch14.call("change");
+ return this;
};
- zoom.scaleBy = function(selection2, k, p) {
- zoom.scaleTo(selection2, function() {
- var k0 = _transform.k, k1 = typeof k === "function" ? k.apply(this, arguments) : k;
- return k0 * k1;
- }, p);
- };
- zoom.scaleTo = function(selection2, k, p) {
- zoom.transform(selection2, function() {
- var e = extent.apply(this, arguments), t0 = _transform, p02 = !p ? centroid(e) : typeof p === "function" ? p.apply(this, arguments) : p, p1 = t0.invert(p02), k1 = typeof k === "function" ? k.apply(this, arguments) : k;
- return constrain(translate(scale(t0, k1), p02, p1), e, translateExtent);
- }, p);
+ drawImages.supported = function() {
+ return !!getService();
};
- zoom.translateBy = function(selection2, x, y) {
- zoom.transform(selection2, function() {
- return constrain(_transform.translate(typeof x === "function" ? x.apply(this, arguments) : x, typeof y === "function" ? y.apply(this, arguments) : y), extent.apply(this, arguments), translateExtent);
- });
+ drawImages.rendered = function(zoom) {
+ return zoom >= minZoom5;
};
- zoom.translateTo = function(selection2, x, y, p) {
- zoom.transform(selection2, function() {
- var e = extent.apply(this, arguments), t = _transform, p02 = !p ? centroid(e) : typeof p === "function" ? p.apply(this, arguments) : p;
- return constrain(identity2.translate(p02[0], p02[1]).scale(t.k).translate(typeof x === "function" ? -x.apply(this, arguments) : -x, typeof y === "function" ? -y.apply(this, arguments) : -y), e, translateExtent);
- }, p);
+ drawImages.validHere = function(extent, zoom) {
+ return zoom >= minZoom5 - 2 && getService().validHere(extent);
};
- function scale(transform2, k) {
- k = Math.max(scaleExtent[0], Math.min(scaleExtent[1], k));
- return k === transform2.k ? transform2 : new Transform(k, transform2.x, transform2.y);
+ init2();
+ return drawImages;
+ }
+
+ // modules/svg/mapillary_images.js
+ function svgMapillaryImages(projection2, context, dispatch14) {
+ const throttledRedraw = throttle_default(function() {
+ dispatch14.call("change");
+ }, 1e3);
+ const minZoom5 = 12;
+ const minMarkerZoom = 16;
+ const minViewfieldZoom2 = 18;
+ let layer = select_default2(null);
+ let _mapillary;
+ function init2() {
+ if (svgMapillaryImages.initialized) return;
+ svgMapillaryImages.enabled = false;
+ svgMapillaryImages.initialized = true;
}
- function translate(transform2, p02, p1) {
- var x = p02[0] - p1[0] * transform2.k, y = p02[1] - p1[1] * transform2.k;
- return x === transform2.x && y === transform2.y ? transform2 : new Transform(transform2.k, x, y);
+ function getService() {
+ if (services.mapillary && !_mapillary) {
+ _mapillary = services.mapillary;
+ _mapillary.event.on("loadedImages", throttledRedraw);
+ } else if (!services.mapillary && _mapillary) {
+ _mapillary = null;
+ }
+ return _mapillary;
}
- function centroid(extent2) {
- return [(+extent2[0][0] + +extent2[1][0]) / 2, (+extent2[0][1] + +extent2[1][1]) / 2];
+ function showLayer() {
+ const service = getService();
+ if (!service) return;
+ editOn();
+ layer.style("opacity", 0).transition().duration(250).style("opacity", 1).on("end", function() {
+ dispatch14.call("change");
+ });
}
- function schedule(transition2, transform2, point) {
- transition2.on("start.zoom", function() {
- gesture(this, arguments).start(null);
- }).on("interrupt.zoom end.zoom", function() {
- gesture(this, arguments).end(null);
- }).tween("zoom", function() {
- var that = this, args = arguments, g = gesture(that, args), e = extent.apply(that, args), p = !point ? centroid(e) : typeof point === "function" ? point.apply(that, args) : point, w = Math.max(e[1][0] - e[0][0], e[1][1] - e[0][1]), a = _transform, b = typeof transform2 === "function" ? transform2.apply(that, args) : transform2, i2 = interpolate(a.invert(p).concat(w / a.k), b.invert(p).concat(w / b.k));
- return function(t) {
- if (t === 1) {
- t = b;
- } else {
- var l = i2(t);
- var k = w / l[2];
- t = new Transform(k, p[0] - l[0] * k, p[1] - l[1] * k);
- }
- g.zoom(null, null, t);
- };
+ function hideLayer() {
+ throttledRedraw.cancel();
+ layer.transition().duration(250).style("opacity", 0).on("end", editOff);
+ }
+ function editOn() {
+ layer.style("display", "block");
+ }
+ function editOff() {
+ layer.selectAll(".viewfield-group").remove();
+ layer.style("display", "none");
+ }
+ function click(d3_event, image) {
+ const service = getService();
+ if (!service) return;
+ service.ensureViewerLoaded(context).then(function() {
+ service.selectImage(context, image.id).showViewer(context);
});
+ context.map().centerEase(image.loc);
}
- function gesture(that, args, clean2) {
- return !clean2 && _activeGesture || new Gesture(that, args);
+ function mouseover(d3_event, image) {
+ const service = getService();
+ if (service) service.setStyles(context, image);
}
- function Gesture(that, args) {
- this.that = that;
- this.args = args;
- this.active = 0;
- this.extent = extent.apply(that, args);
+ function mouseout() {
+ const service = getService();
+ if (service) service.setStyles(context, null);
}
- Gesture.prototype = {
- start: function(d3_event) {
- if (++this.active === 1) {
- _activeGesture = this;
- dispatch10.call("start", this, d3_event);
- }
- return this;
- },
- zoom: function(d3_event, key, transform2) {
- if (this.mouse && key !== "mouse")
- this.mouse[1] = transform2.invert(this.mouse[0]);
- if (this.pointer0 && key !== "touch")
- this.pointer0[1] = transform2.invert(this.pointer0[0]);
- if (this.pointer1 && key !== "touch")
- this.pointer1[1] = transform2.invert(this.pointer1[0]);
- _transform = transform2;
- dispatch10.call("zoom", this, d3_event, key, transform2);
- return this;
- },
- end: function(d3_event) {
- if (--this.active === 0) {
- _activeGesture = null;
- dispatch10.call("end", this, d3_event);
- }
- return this;
+ function transform2(d2) {
+ let t2 = svgPointTransform(projection2)(d2);
+ if (d2.ca) {
+ t2 += " rotate(" + Math.floor(d2.ca) + ",0,0)";
}
- };
- function wheeled(d3_event) {
- if (!filter2.apply(this, arguments))
- return;
- var g = gesture(this, arguments), t = _transform, k = Math.max(scaleExtent[0], Math.min(scaleExtent[1], t.k * Math.pow(2, wheelDelta.apply(this, arguments)))), p = utilFastMouse(this)(d3_event);
- if (g.wheel) {
- if (g.mouse[0][0] !== p[0] || g.mouse[0][1] !== p[1]) {
- g.mouse[1] = t.invert(g.mouse[0] = p);
- }
- clearTimeout(g.wheel);
- } else {
- g.mouse = [p, t.invert(p)];
- interrupt_default(this);
- g.start(d3_event);
+ return t2;
+ }
+ function filterImages(images) {
+ const showsPano = context.photos().showsPanoramic();
+ const showsFlat = context.photos().showsFlat();
+ const fromDate = context.photos().fromDate();
+ const toDate = context.photos().toDate();
+ if (!showsPano || !showsFlat) {
+ images = images.filter(function(image) {
+ if (image.is_pano) return showsPano;
+ return showsFlat;
+ });
}
- d3_event.preventDefault();
- d3_event.stopImmediatePropagation();
- g.wheel = setTimeout(wheelidled, _wheelDelay);
- g.zoom(d3_event, "mouse", constrain(translate(scale(t, k), g.mouse[0], g.mouse[1]), g.extent, translateExtent));
- function wheelidled() {
- g.wheel = null;
- g.end(d3_event);
+ if (fromDate) {
+ images = images.filter(function(image) {
+ return new Date(image.captured_at).getTime() >= new Date(fromDate).getTime();
+ });
+ }
+ if (toDate) {
+ images = images.filter(function(image) {
+ return new Date(image.captured_at).getTime() <= new Date(toDate).getTime();
+ });
}
+ return images;
}
- var _downPointerIDs = /* @__PURE__ */ new Set();
- var _pointerLocGetter;
- function pointerdown(d3_event) {
- _downPointerIDs.add(d3_event.pointerId);
- if (!filter2.apply(this, arguments))
- return;
- var g = gesture(this, arguments, _downPointerIDs.size === 1);
- var started;
- d3_event.stopImmediatePropagation();
- _pointerLocGetter = utilFastMouse(this);
- var loc = _pointerLocGetter(d3_event);
- var p = [loc, _transform.invert(loc), d3_event.pointerId];
- if (!g.pointer0) {
- g.pointer0 = p;
- started = true;
- } else if (!g.pointer1 && g.pointer0[2] !== p[2]) {
- g.pointer1 = p;
+ function filterSequences(sequences) {
+ const showsPano = context.photos().showsPanoramic();
+ const showsFlat = context.photos().showsFlat();
+ const fromDate = context.photos().fromDate();
+ const toDate = context.photos().toDate();
+ if (!showsPano || !showsFlat) {
+ sequences = sequences.filter(function(sequence) {
+ if (sequence.properties.hasOwnProperty("is_pano")) {
+ if (sequence.properties.is_pano) return showsPano;
+ return showsFlat;
+ }
+ return false;
+ });
}
- if (started) {
- interrupt_default(this);
- g.start(d3_event);
+ if (fromDate) {
+ sequences = sequences.filter(function(sequence) {
+ return new Date(sequence.properties.captured_at).getTime() >= new Date(fromDate).getTime().toString();
+ });
+ }
+ if (toDate) {
+ sequences = sequences.filter(function(sequence) {
+ return new Date(sequence.properties.captured_at).getTime() <= new Date(toDate).getTime().toString();
+ });
}
+ return sequences;
}
- function pointermove(d3_event) {
- if (!_downPointerIDs.has(d3_event.pointerId))
- return;
- if (!_activeGesture || !_pointerLocGetter)
- return;
- var g = gesture(this, arguments);
- var isPointer0 = g.pointer0 && g.pointer0[2] === d3_event.pointerId;
- var isPointer1 = !isPointer0 && g.pointer1 && g.pointer1[2] === d3_event.pointerId;
- if ((isPointer0 || isPointer1) && "buttons" in d3_event && !d3_event.buttons) {
- if (g.pointer0)
- _downPointerIDs.delete(g.pointer0[2]);
- if (g.pointer1)
- _downPointerIDs.delete(g.pointer1[2]);
- g.end(d3_event);
- return;
+ function update() {
+ const z2 = ~~context.map().zoom();
+ const showMarkers = z2 >= minMarkerZoom;
+ const showViewfields = z2 >= minViewfieldZoom2;
+ const service = getService();
+ let sequences = service ? service.sequences(projection2) : [];
+ let images = service && showMarkers ? service.images(projection2) : [];
+ images = filterImages(images);
+ sequences = filterSequences(sequences, service);
+ service.filterViewer(context);
+ let traces = layer.selectAll(".sequences").selectAll(".sequence").data(sequences, function(d2) {
+ return d2.properties.id;
+ });
+ traces.exit().remove();
+ traces = traces.enter().append("path").attr("class", "sequence").merge(traces).attr("d", svgPath(projection2).geojson);
+ const groups = layer.selectAll(".markers").selectAll(".viewfield-group").data(images, function(d2) {
+ return d2.id;
+ });
+ groups.exit().remove();
+ const groupsEnter = groups.enter().append("g").attr("class", "viewfield-group").on("mouseenter", mouseover).on("mouseleave", mouseout).on("click", click);
+ groupsEnter.append("g").attr("class", "viewfield-scale");
+ const markers = groups.merge(groupsEnter).sort(function(a2, b2) {
+ return b2.loc[1] - a2.loc[1];
+ }).attr("transform", transform2).select(".viewfield-scale");
+ markers.selectAll("circle").data([0]).enter().append("circle").attr("dx", "0").attr("dy", "0").attr("r", "6");
+ const viewfields = markers.selectAll(".viewfield").data(showViewfields ? [0] : []);
+ viewfields.exit().remove();
+ viewfields.enter().insert("path", "circle").attr("class", "viewfield").classed("pano", function() {
+ return this.parentNode.__data__.is_pano;
+ }).attr("transform", "scale(1.5,1.5),translate(-8, -13)").attr("d", viewfieldPath);
+ function viewfieldPath() {
+ if (this.parentNode.__data__.is_pano) {
+ return "M 8,13 m -10,0 a 10,10 0 1,0 20,0 a 10,10 0 1,0 -20,0";
+ } else {
+ return "M 6,9 C 8,8.4 8,8.4 10,9 L 16,-2 C 12,-5 4,-5 0,-2 z";
+ }
}
- d3_event.preventDefault();
- d3_event.stopImmediatePropagation();
- var loc = _pointerLocGetter(d3_event);
- var t, p, l;
- if (isPointer0)
- g.pointer0[0] = loc;
- else if (isPointer1)
- g.pointer1[0] = loc;
- t = _transform;
- if (g.pointer1) {
- var p02 = g.pointer0[0], l0 = g.pointer0[1], p1 = g.pointer1[0], l1 = g.pointer1[1], dp = (dp = p1[0] - p02[0]) * dp + (dp = p1[1] - p02[1]) * dp, dl = (dl = l1[0] - l0[0]) * dl + (dl = l1[1] - l0[1]) * dl;
- t = scale(t, Math.sqrt(dp / dl));
- p = [(p02[0] + p1[0]) / 2, (p02[1] + p1[1]) / 2];
- l = [(l0[0] + l1[0]) / 2, (l0[1] + l1[1]) / 2];
- } else if (g.pointer0) {
- p = g.pointer0[0];
- l = g.pointer0[1];
+ }
+ function drawImages(selection2) {
+ const enabled = svgMapillaryImages.enabled;
+ const service = getService();
+ layer = selection2.selectAll(".layer-mapillary").data(service ? [0] : []);
+ layer.exit().remove();
+ const layerEnter = layer.enter().append("g").attr("class", "layer-mapillary").style("display", enabled ? "block" : "none");
+ layerEnter.append("g").attr("class", "sequences");
+ layerEnter.append("g").attr("class", "markers");
+ layer = layerEnter.merge(layer);
+ if (enabled) {
+ if (service && ~~context.map().zoom() >= minZoom5) {
+ editOn();
+ update();
+ service.loadImages(projection2);
+ } else {
+ editOff();
+ }
+ }
+ }
+ drawImages.enabled = function(_2) {
+ if (!arguments.length) return svgMapillaryImages.enabled;
+ svgMapillaryImages.enabled = _2;
+ if (svgMapillaryImages.enabled) {
+ showLayer();
+ context.photos().on("change.mapillary_images", update);
} else {
- return;
+ hideLayer();
+ context.photos().on("change.mapillary_images", null);
+ }
+ dispatch14.call("change");
+ return this;
+ };
+ drawImages.supported = function() {
+ return !!getService();
+ };
+ drawImages.rendered = function(zoom) {
+ return zoom >= minZoom5;
+ };
+ init2();
+ return drawImages;
+ }
+
+ // modules/svg/mapillary_position.js
+ function svgMapillaryPosition(projection2, context) {
+ const throttledRedraw = throttle_default(function() {
+ update();
+ }, 1e3);
+ const minZoom5 = 12;
+ const minViewfieldZoom2 = 18;
+ let layer = select_default2(null);
+ let _mapillary;
+ let viewerCompassAngle;
+ function init2() {
+ if (svgMapillaryPosition.initialized) return;
+ svgMapillaryPosition.initialized = true;
+ }
+ function getService() {
+ if (services.mapillary && !_mapillary) {
+ _mapillary = services.mapillary;
+ _mapillary.event.on("imageChanged", throttledRedraw);
+ _mapillary.event.on("bearingChanged", function(e3) {
+ viewerCompassAngle = e3.bearing;
+ if (context.map().isTransformed()) return;
+ layer.selectAll(".viewfield-group.currentView").filter(function(d2) {
+ return d2.is_pano;
+ }).attr("transform", transform2);
+ });
+ } else if (!services.mapillary && _mapillary) {
+ _mapillary = null;
+ }
+ return _mapillary;
+ }
+ function editOn() {
+ layer.style("display", "block");
+ }
+ function editOff() {
+ layer.selectAll(".viewfield-group").remove();
+ layer.style("display", "none");
+ }
+ function transform2(d2) {
+ let t2 = svgPointTransform(projection2)(d2);
+ if (d2.is_pano && viewerCompassAngle !== null && isFinite(viewerCompassAngle)) {
+ t2 += " rotate(" + Math.floor(viewerCompassAngle) + ",0,0)";
+ } else if (d2.ca) {
+ t2 += " rotate(" + Math.floor(d2.ca) + ",0,0)";
}
- g.zoom(d3_event, "touch", constrain(translate(t, p, l), g.extent, translateExtent));
+ return t2;
}
- function pointerup(d3_event) {
- if (!_downPointerIDs.has(d3_event.pointerId))
- return;
- _downPointerIDs.delete(d3_event.pointerId);
- if (!_activeGesture)
- return;
- var g = gesture(this, arguments);
- d3_event.stopImmediatePropagation();
- if (g.pointer0 && g.pointer0[2] === d3_event.pointerId)
- delete g.pointer0;
- else if (g.pointer1 && g.pointer1[2] === d3_event.pointerId)
- delete g.pointer1;
- if (g.pointer1 && !g.pointer0) {
- g.pointer0 = g.pointer1;
- delete g.pointer1;
- }
- if (g.pointer0) {
- g.pointer0[1] = _transform.invert(g.pointer0[0]);
+ function update() {
+ const z2 = ~~context.map().zoom();
+ const showViewfields = z2 >= minViewfieldZoom2;
+ const service = getService();
+ const image = service && service.getActiveImage();
+ const groups = layer.selectAll(".markers").selectAll(".viewfield-group").data(image ? [image] : [], function(d2) {
+ return d2.id;
+ });
+ groups.exit().remove();
+ const groupsEnter = groups.enter().append("g").attr("class", "viewfield-group currentView highlighted");
+ groupsEnter.append("g").attr("class", "viewfield-scale");
+ const markers = groups.merge(groupsEnter).attr("transform", transform2).select(".viewfield-scale");
+ markers.selectAll("circle").data([0]).enter().append("circle").attr("dx", "0").attr("dy", "0").attr("r", "6");
+ const viewfields = markers.selectAll(".viewfield").data(showViewfields ? [0] : []);
+ viewfields.exit().remove();
+ viewfields.enter().insert("path", "circle").attr("class", "viewfield").attr("transform", "scale(1.5,1.5),translate(-8, -13)").attr("d", "M 6,9 C 8,8.4 8,8.4 10,9 L 16,-2 C 12,-5 4,-5 0,-2 z");
+ }
+ function drawImages(selection2) {
+ const service = getService();
+ layer = selection2.selectAll(".layer-mapillary-position").data(service ? [0] : []);
+ layer.exit().remove();
+ const layerEnter = layer.enter().append("g").attr("class", "layer-mapillary-position");
+ layerEnter.append("g").attr("class", "markers");
+ layer = layerEnter.merge(layer);
+ if (service && ~~context.map().zoom() >= minZoom5) {
+ editOn();
+ update();
} else {
- g.end(d3_event);
+ editOff();
}
}
- zoom.wheelDelta = function(_) {
- return arguments.length ? (wheelDelta = utilFunctor(+_), zoom) : wheelDelta;
- };
- zoom.filter = function(_) {
- return arguments.length ? (filter2 = utilFunctor(!!_), zoom) : filter2;
- };
- zoom.extent = function(_) {
- return arguments.length ? (extent = utilFunctor([[+_[0][0], +_[0][1]], [+_[1][0], +_[1][1]]]), zoom) : extent;
- };
- zoom.scaleExtent = function(_) {
- return arguments.length ? (scaleExtent[0] = +_[0], scaleExtent[1] = +_[1], zoom) : [scaleExtent[0], scaleExtent[1]];
- };
- zoom.translateExtent = function(_) {
- return arguments.length ? (translateExtent[0][0] = +_[0][0], translateExtent[1][0] = +_[1][0], translateExtent[0][1] = +_[0][1], translateExtent[1][1] = +_[1][1], zoom) : [[translateExtent[0][0], translateExtent[0][1]], [translateExtent[1][0], translateExtent[1][1]]];
- };
- zoom.constrain = function(_) {
- return arguments.length ? (constrain = _, zoom) : constrain;
+ drawImages.enabled = function() {
+ update();
+ return this;
};
- zoom.interpolate = function(_) {
- return arguments.length ? (interpolate = _, zoom) : interpolate;
+ drawImages.supported = function() {
+ return !!getService();
};
- zoom._transform = function(_) {
- return arguments.length ? (_transform = _, zoom) : _transform;
+ drawImages.rendered = function(zoom) {
+ return zoom >= minZoom5;
};
- return utilRebind(zoom, dispatch10, "on");
+ init2();
+ return drawImages;
}
- // modules/util/double_up.js
- function utilDoubleUp() {
- var dispatch10 = dispatch_default("doubleUp");
- var _maxTimespan = 500;
- var _maxDistance = 20;
- var _pointer;
- function pointerIsValidFor(loc) {
- return new Date().getTime() - _pointer.startTime <= _maxTimespan && geoVecLength(_pointer.startLoc, loc) <= _maxDistance;
+ // modules/svg/mapillary_signs.js
+ function svgMapillarySigns(projection2, context, dispatch14) {
+ const throttledRedraw = throttle_default(function() {
+ dispatch14.call("change");
+ }, 1e3);
+ const minZoom5 = 12;
+ let layer = select_default2(null);
+ let _mapillary;
+ function init2() {
+ if (svgMapillarySigns.initialized) return;
+ svgMapillarySigns.enabled = false;
+ svgMapillarySigns.initialized = true;
}
- function pointerdown(d3_event) {
- if (d3_event.ctrlKey || d3_event.button === 2)
- return;
- var loc = [d3_event.clientX, d3_event.clientY];
- if (_pointer && !pointerIsValidFor(loc)) {
- _pointer = void 0;
- }
- if (!_pointer) {
- _pointer = {
- startLoc: loc,
- startTime: new Date().getTime(),
- upCount: 0,
- pointerId: d3_event.pointerId
- };
- } else {
- _pointer.pointerId = d3_event.pointerId;
+ function getService() {
+ if (services.mapillary && !_mapillary) {
+ _mapillary = services.mapillary;
+ _mapillary.event.on("loadedSigns", throttledRedraw);
+ } else if (!services.mapillary && _mapillary) {
+ _mapillary = null;
}
+ return _mapillary;
}
- function pointerup(d3_event) {
- if (d3_event.ctrlKey || d3_event.button === 2)
- return;
- if (!_pointer || _pointer.pointerId !== d3_event.pointerId)
- return;
- _pointer.upCount += 1;
- if (_pointer.upCount === 2) {
- var loc = [d3_event.clientX, d3_event.clientY];
- if (pointerIsValidFor(loc)) {
- var locInThis = utilFastMouse(this)(d3_event);
- dispatch10.call("doubleUp", this, d3_event, locInThis);
- }
- _pointer = void 0;
- }
+ function showLayer() {
+ const service = getService();
+ if (!service) return;
+ service.loadSignResources(context);
+ editOn();
}
- function doubleUp(selection2) {
- if ("PointerEvent" in window) {
- selection2.on("pointerdown.doubleUp", pointerdown).on("pointerup.doubleUp", pointerup);
- } else {
- selection2.on("dblclick.doubleUp", function(d3_event) {
- dispatch10.call("doubleUp", this, d3_event, utilFastMouse(this)(d3_event));
- });
- }
+ function hideLayer() {
+ throttledRedraw.cancel();
+ editOff();
}
- doubleUp.off = function(selection2) {
- selection2.on("pointerdown.doubleUp", null).on("pointerup.doubleUp", null).on("dblclick.doubleUp", null);
- };
- return utilRebind(doubleUp, dispatch10, "on");
- }
-
- // modules/renderer/map.js
- var TILESIZE = 256;
- var minZoom2 = 2;
- var maxZoom = 24;
- var kMin = geoZoomToScale(minZoom2, TILESIZE);
- var kMax = geoZoomToScale(maxZoom, TILESIZE);
- function clamp(num, min3, max3) {
- return Math.max(min3, Math.min(num, max3));
- }
- function rendererMap(context) {
- var dispatch10 = dispatch_default("move", "drawn", "crossEditableZoom", "hitMinZoom", "changeHighlighting", "changeAreaFill");
- var projection2 = context.projection;
- var curtainProjection = context.curtainProjection;
- var drawLayers;
- var drawPoints;
- var drawVertices;
- var drawLines;
- var drawAreas;
- var drawMidpoints;
- var drawLabels;
- var _selection = select_default2(null);
- var supersurface = select_default2(null);
- var wrapper = select_default2(null);
- var surface = select_default2(null);
- var _dimensions = [1, 1];
- var _dblClickZoomEnabled = true;
- var _redrawEnabled = true;
- var _gestureTransformStart;
- var _transformStart = projection2.transform();
- var _transformLast;
- var _isTransformed = false;
- var _minzoom = 0;
- var _getMouseCoords;
- var _lastPointerEvent;
- var _lastWithinEditableZoom;
- var _pointerDown = false;
- var _pointerPrefix = "PointerEvent" in window ? "pointer" : "mouse";
- var _zoomerPannerFunction = "PointerEvent" in window ? utilZoomPan : zoom_default2;
- var _zoomerPanner = _zoomerPannerFunction().scaleExtent([kMin, kMax]).interpolate(value_default).filter(zoomEventFilter).on("zoom.map", zoomPan).on("start.map", function(d3_event) {
- _pointerDown = d3_event && (d3_event.type === "pointerdown" || d3_event.sourceEvent && d3_event.sourceEvent.type === "pointerdown");
- }).on("end.map", function() {
- _pointerDown = false;
- });
- var _doubleUpHandler = utilDoubleUp();
- var scheduleRedraw = throttle_default(redraw, 750);
- function cancelPendingRedraw() {
- scheduleRedraw.cancel();
+ function editOn() {
+ layer.style("display", "block");
}
- function map2(selection2) {
- _selection = selection2;
- context.on("change.map", immediateRedraw);
- var osm = context.connection();
- if (osm) {
- osm.on("change.map", immediateRedraw);
- }
- function didUndoOrRedo(targetTransform) {
- var mode = context.mode().id;
- if (mode !== "browse" && mode !== "select")
- return;
- if (targetTransform) {
- map2.transformEase(targetTransform);
- }
- }
- context.history().on("merge.map", function() {
- scheduleRedraw();
- }).on("change.map", immediateRedraw).on("undone.map", function(stack, fromStack) {
- didUndoOrRedo(fromStack.transform);
- }).on("redone.map", function(stack) {
- didUndoOrRedo(stack.transform);
- });
- context.background().on("change.map", immediateRedraw);
- context.features().on("redraw.map", immediateRedraw);
- drawLayers.on("change.map", function() {
- context.background().updateImagery();
- immediateRedraw();
- });
- selection2.on("wheel.map mousewheel.map", function(d3_event) {
- d3_event.preventDefault();
- }).call(_zoomerPanner).call(_zoomerPanner.transform, projection2.transform()).on("dblclick.zoom", null);
- map2.supersurface = supersurface = selection2.append("div").attr("class", "supersurface").call(utilSetTransform, 0, 0);
- wrapper = supersurface.append("div").attr("class", "layer layer-data");
- map2.surface = surface = wrapper.call(drawLayers).selectAll(".surface");
- surface.call(drawLabels.observe).call(_doubleUpHandler).on(_pointerPrefix + "down.zoom", function(d3_event) {
- _lastPointerEvent = d3_event;
- if (d3_event.button === 2) {
- d3_event.stopPropagation();
- }
- }, true).on(_pointerPrefix + "up.zoom", function(d3_event) {
- _lastPointerEvent = d3_event;
- if (resetTransform()) {
- immediateRedraw();
- }
- }).on(_pointerPrefix + "move.map", function(d3_event) {
- _lastPointerEvent = d3_event;
- }).on(_pointerPrefix + "over.vertices", function(d3_event) {
- if (map2.editableDataEnabled() && !_isTransformed) {
- var hover = d3_event.target.__data__;
- surface.call(drawVertices.drawHover, context.graph(), hover, map2.extent());
- dispatch10.call("drawn", this, { full: false });
- }
- }).on(_pointerPrefix + "out.vertices", function(d3_event) {
- if (map2.editableDataEnabled() && !_isTransformed) {
- var hover = d3_event.relatedTarget && d3_event.relatedTarget.__data__;
- surface.call(drawVertices.drawHover, context.graph(), hover, map2.extent());
- dispatch10.call("drawn", this, { full: false });
- }
- });
- var detected = utilDetect();
- if ("GestureEvent" in window && !detected.isMobileWebKit) {
- surface.on("gesturestart.surface", function(d3_event) {
- d3_event.preventDefault();
- _gestureTransformStart = projection2.transform();
- }).on("gesturechange.surface", gestureChange);
- }
- updateAreaFill();
- _doubleUpHandler.on("doubleUp.map", function(d3_event, p02) {
- if (!_dblClickZoomEnabled)
- return;
- if (typeof d3_event.target.__data__ === "object" && !select_default2(d3_event.target).classed("fill"))
- return;
- var zoomOut2 = d3_event.shiftKey;
- var t = projection2.transform();
- var p1 = t.invert(p02);
- t = t.scale(zoomOut2 ? 0.5 : 2);
- t.x = p02[0] - p1[0] * t.k;
- t.y = p02[1] - p1[1] * t.k;
- map2.transformEase(t);
- });
- context.on("enter.map", function() {
- if (!map2.editableDataEnabled(true))
- return;
- if (_isTransformed)
- return;
- var graph = context.graph();
- var selectedAndParents = {};
- context.selectedIDs().forEach(function(id2) {
- var entity = graph.hasEntity(id2);
- if (entity) {
- selectedAndParents[entity.id] = entity;
- if (entity.type === "node") {
- graph.parentWays(entity).forEach(function(parent) {
- selectedAndParents[parent.id] = parent;
- });
- }
- }
- });
- var data = Object.values(selectedAndParents);
- var filter2 = function(d) {
- return d.id in selectedAndParents;
- };
- data = context.features().filter(data, graph);
- surface.call(drawVertices.drawSelected, graph, map2.extent()).call(drawLines, graph, data, filter2).call(drawAreas, graph, data, filter2).call(drawMidpoints, graph, data, filter2, map2.trimmedExtent());
- dispatch10.call("drawn", this, { full: false });
- scheduleRedraw();
- });
- map2.dimensions(utilGetDimensions(selection2));
+ function editOff() {
+ layer.selectAll(".icon-sign").remove();
+ layer.style("display", "none");
}
- function zoomEventFilter(d3_event) {
- if (d3_event.type === "mousedown") {
- var hasOrphan = false;
- var listeners = window.__on;
- for (var i2 = 0; i2 < listeners.length; i2++) {
- var listener = listeners[i2];
- if (listener.name === "zoom" && listener.type === "mouseup") {
- hasOrphan = true;
- break;
- }
- }
- if (hasOrphan) {
- var event = window.CustomEvent;
- if (event) {
- event = new event("mouseup");
+ function click(d3_event, d2) {
+ const service = getService();
+ if (!service) return;
+ context.map().centerEase(d2.loc);
+ const selectedImageId = service.getActiveImage() && service.getActiveImage().id;
+ service.getDetections(d2.id).then((detections) => {
+ if (detections.length) {
+ const imageId = detections[0].image.id;
+ if (imageId === selectedImageId) {
+ service.highlightDetection(detections[0]).selectImage(context, imageId);
} else {
- event = window.document.createEvent("Event");
- event.initEvent("mouseup", false, false);
+ service.ensureViewerLoaded(context).then(function() {
+ service.highlightDetection(detections[0]).selectImage(context, imageId).showViewer(context);
+ });
}
- event.view = window;
- window.dispatchEvent(event);
}
+ });
+ }
+ function filterData(detectedFeatures) {
+ var fromDate = context.photos().fromDate();
+ var toDate = context.photos().toDate();
+ if (fromDate) {
+ var fromTimestamp = new Date(fromDate).getTime();
+ detectedFeatures = detectedFeatures.filter(function(feature3) {
+ return new Date(feature3.last_seen_at).getTime() >= fromTimestamp;
+ });
}
- return d3_event.button !== 2;
+ if (toDate) {
+ var toTimestamp = new Date(toDate).getTime();
+ detectedFeatures = detectedFeatures.filter(function(feature3) {
+ return new Date(feature3.first_seen_at).getTime() <= toTimestamp;
+ });
+ }
+ return detectedFeatures;
}
- function pxCenter() {
- return [_dimensions[0] / 2, _dimensions[1] / 2];
+ function update() {
+ const service = getService();
+ let data = service ? service.signs(projection2) : [];
+ data = filterData(data);
+ const transform2 = svgPointTransform(projection2);
+ const signs = layer.selectAll(".icon-sign").data(data, function(d2) {
+ return d2.id;
+ });
+ signs.exit().remove();
+ const enter = signs.enter().append("g").attr("class", "icon-sign icon-detected").on("click", click);
+ enter.append("use").attr("width", "24px").attr("height", "24px").attr("x", "-12px").attr("y", "-12px").attr("xlink:href", function(d2) {
+ return "#" + d2.value;
+ });
+ enter.append("rect").attr("width", "24px").attr("height", "24px").attr("x", "-12px").attr("y", "-12px");
+ signs.merge(enter).attr("transform", transform2);
}
- function drawEditable(difference, extent) {
- var mode = context.mode();
- var graph = context.graph();
- var features2 = context.features();
- var all = context.history().intersects(map2.extent());
- var fullRedraw = false;
- var data;
- var set3;
- var filter2;
- var applyFeatureLayerFilters = true;
- if (map2.isInWideSelection()) {
- data = [];
- utilEntityAndDeepMemberIDs(mode.selectedIDs(), context.graph()).forEach(function(id2) {
- var entity = context.hasEntity(id2);
- if (entity)
- data.push(entity);
- });
- fullRedraw = true;
- filter2 = utilFunctor(true);
- applyFeatureLayerFilters = false;
- } else if (difference) {
- var complete = difference.complete(map2.extent());
- data = Object.values(complete).filter(Boolean);
- set3 = new Set(Object.keys(complete));
- filter2 = function(d) {
- return set3.has(d.id);
- };
- features2.clear(data);
- } else {
- if (features2.gatherStats(all, graph, _dimensions)) {
- extent = void 0;
- }
- if (extent) {
- data = context.history().intersects(map2.extent().intersection(extent));
- set3 = new Set(data.map(function(entity) {
- return entity.id;
- }));
- filter2 = function(d) {
- return set3.has(d.id);
- };
+ function drawSigns(selection2) {
+ const enabled = svgMapillarySigns.enabled;
+ const service = getService();
+ layer = selection2.selectAll(".layer-mapillary-signs").data(service ? [0] : []);
+ layer.exit().remove();
+ layer = layer.enter().append("g").attr("class", "layer-mapillary-signs layer-mapillary-detections").style("display", enabled ? "block" : "none").merge(layer);
+ if (enabled) {
+ if (service && ~~context.map().zoom() >= minZoom5) {
+ editOn();
+ update();
+ service.loadSigns(projection2);
+ service.showSignDetections(true);
} else {
- data = all;
- fullRedraw = true;
- filter2 = utilFunctor(true);
+ editOff();
}
+ } else if (service) {
+ service.showSignDetections(false);
}
- if (applyFeatureLayerFilters) {
- data = features2.filter(data, graph);
+ }
+ drawSigns.enabled = function(_2) {
+ if (!arguments.length) return svgMapillarySigns.enabled;
+ svgMapillarySigns.enabled = _2;
+ if (svgMapillarySigns.enabled) {
+ showLayer();
+ context.photos().on("change.mapillary_signs", update);
} else {
- context.features().resetStats();
- }
- if (mode && mode.id === "select") {
- surface.call(drawVertices.drawSelected, graph, map2.extent());
+ hideLayer();
+ context.photos().on("change.mapillary_signs", null);
}
- surface.call(drawVertices, graph, data, filter2, map2.extent(), fullRedraw).call(drawLines, graph, data, filter2).call(drawAreas, graph, data, filter2).call(drawMidpoints, graph, data, filter2, map2.trimmedExtent()).call(drawLabels, graph, data, filter2, _dimensions, fullRedraw).call(drawPoints, graph, data, filter2);
- dispatch10.call("drawn", this, { full: true });
- }
- map2.init = function() {
- drawLayers = svgLayers(projection2, context);
- drawPoints = svgPoints(projection2, context);
- drawVertices = svgVertices(projection2, context);
- drawLines = svgLines(projection2, context);
- drawAreas = svgAreas(projection2, context);
- drawMidpoints = svgMidpoints(projection2, context);
- drawLabels = svgLabels(projection2, context);
+ dispatch14.call("change");
+ return this;
};
- function editOff() {
- context.features().resetStats();
- surface.selectAll(".layer-osm *").remove();
- surface.selectAll(".layer-touch:not(.markers) *").remove();
- var allowed = {
- "browse": true,
- "save": true,
- "select-note": true,
- "select-data": true,
- "select-error": true
- };
- var mode = context.mode();
- if (mode && !allowed[mode.id]) {
- context.enter(modeBrowse(context));
+ drawSigns.supported = function() {
+ return !!getService();
+ };
+ drawSigns.rendered = function(zoom) {
+ return zoom >= minZoom5;
+ };
+ init2();
+ return drawSigns;
+ }
+
+ // modules/svg/mapillary_map_features.js
+ function svgMapillaryMapFeatures(projection2, context, dispatch14) {
+ const throttledRedraw = throttle_default(function() {
+ dispatch14.call("change");
+ }, 1e3);
+ const minZoom5 = 12;
+ let layer = select_default2(null);
+ let _mapillary;
+ function init2() {
+ if (svgMapillaryMapFeatures.initialized) return;
+ svgMapillaryMapFeatures.enabled = false;
+ svgMapillaryMapFeatures.initialized = true;
+ }
+ function getService() {
+ if (services.mapillary && !_mapillary) {
+ _mapillary = services.mapillary;
+ _mapillary.event.on("loadedMapFeatures", throttledRedraw);
+ } else if (!services.mapillary && _mapillary) {
+ _mapillary = null;
}
- dispatch10.call("drawn", this, { full: true });
+ return _mapillary;
}
- function gestureChange(d3_event) {
- var e = d3_event;
- e.preventDefault();
- var props = {
- deltaMode: 0,
- deltaY: 1,
- clientX: e.clientX,
- clientY: e.clientY,
- screenX: e.screenX,
- screenY: e.screenY,
- x: e.x,
- y: e.y
- };
- var e22 = new WheelEvent("wheel", props);
- e22._scale = e.scale;
- e22._rotation = e.rotation;
- _selection.node().dispatchEvent(e22);
+ function showLayer() {
+ const service = getService();
+ if (!service) return;
+ service.loadObjectResources(context);
+ editOn();
}
- function zoomPan(event, key, transform2) {
- var source = event && event.sourceEvent || event;
- var eventTransform = transform2 || event && event.transform;
- var x = eventTransform.x;
- var y = eventTransform.y;
- var k = eventTransform.k;
- if (source && source.type === "wheel") {
- if (_pointerDown)
- return;
- var detected = utilDetect();
- var dX = source.deltaX;
- var dY = source.deltaY;
- var x2 = x;
- var y2 = y;
- var k2 = k;
- var t0, p02, p1;
- if (source.deltaMode === 1) {
- var lines = Math.abs(source.deltaY);
- var sign2 = source.deltaY > 0 ? 1 : -1;
- dY = sign2 * clamp(Math.exp((lines - 1) * 0.75) * 4.000244140625, 4.000244140625, 350.000244140625);
- if (detected.os !== "mac") {
- dY *= 5;
- }
- t0 = _isTransformed ? _transformLast : _transformStart;
- p02 = _getMouseCoords(source);
- p1 = t0.invert(p02);
- k2 = t0.k * Math.pow(2, -dY / 500);
- k2 = clamp(k2, kMin, kMax);
- x2 = p02[0] - p1[0] * k2;
- y2 = p02[1] - p1[1] * k2;
- } else if (source._scale) {
- t0 = _gestureTransformStart;
- p02 = _getMouseCoords(source);
- p1 = t0.invert(p02);
- k2 = t0.k * source._scale;
- k2 = clamp(k2, kMin, kMax);
- x2 = p02[0] - p1[0] * k2;
- y2 = p02[1] - p1[1] * k2;
- } else if (source.ctrlKey && !isInteger(dY)) {
- dY *= 6;
- t0 = _isTransformed ? _transformLast : _transformStart;
- p02 = _getMouseCoords(source);
- p1 = t0.invert(p02);
- k2 = t0.k * Math.pow(2, -dY / 500);
- k2 = clamp(k2, kMin, kMax);
- x2 = p02[0] - p1[0] * k2;
- y2 = p02[1] - p1[1] * k2;
- } else if ((source.altKey || source.shiftKey) && isInteger(dY)) {
- t0 = _isTransformed ? _transformLast : _transformStart;
- p02 = _getMouseCoords(source);
- p1 = t0.invert(p02);
- k2 = t0.k * Math.pow(2, -dY / 500);
- k2 = clamp(k2, kMin, kMax);
- x2 = p02[0] - p1[0] * k2;
- y2 = p02[1] - p1[1] * k2;
- } else if (detected.os === "mac" && detected.browser !== "Firefox" && !source.ctrlKey && isInteger(dX) && isInteger(dY)) {
- p1 = projection2.translate();
- x2 = p1[0] - dX;
- y2 = p1[1] - dY;
- k2 = projection2.scale();
- k2 = clamp(k2, kMin, kMax);
- }
- if (x2 !== x || y2 !== y || k2 !== k) {
- x = x2;
- y = y2;
- k = k2;
- eventTransform = identity2.translate(x2, y2).scale(k2);
- if (_zoomerPanner._transform) {
- _zoomerPanner._transform(eventTransform);
+ function hideLayer() {
+ throttledRedraw.cancel();
+ editOff();
+ }
+ function editOn() {
+ layer.style("display", "block");
+ }
+ function editOff() {
+ layer.selectAll(".icon-map-feature").remove();
+ layer.style("display", "none");
+ }
+ function click(d3_event, d2) {
+ const service = getService();
+ if (!service) return;
+ context.map().centerEase(d2.loc);
+ const selectedImageId = service.getActiveImage() && service.getActiveImage().id;
+ service.getDetections(d2.id).then((detections) => {
+ if (detections.length) {
+ const imageId = detections[0].image.id;
+ if (imageId === selectedImageId) {
+ service.highlightDetection(detections[0]).selectImage(context, imageId);
} else {
- _selection.node().__zoom = eventTransform;
+ service.ensureViewerLoaded(context).then(function() {
+ service.highlightDetection(detections[0]).selectImage(context, imageId).showViewer(context);
+ });
}
}
- }
- if (_transformStart.x === x && _transformStart.y === y && _transformStart.k === k) {
- return;
- }
- if (geoScaleToZoom(k, TILESIZE) < _minzoom) {
- surface.interrupt();
- dispatch10.call("hitMinZoom", this, map2);
- setCenterZoom(map2.center(), context.minEditableZoom(), 0, true);
- scheduleRedraw();
- dispatch10.call("move", this, map2);
- return;
- }
- projection2.transform(eventTransform);
- var withinEditableZoom = map2.withinEditableZoom();
- if (_lastWithinEditableZoom !== withinEditableZoom) {
- if (_lastWithinEditableZoom !== void 0) {
- dispatch10.call("crossEditableZoom", this, withinEditableZoom);
- }
- _lastWithinEditableZoom = withinEditableZoom;
- }
- var scale = k / _transformStart.k;
- var tX = (x / scale - _transformStart.x) * scale;
- var tY = (y / scale - _transformStart.y) * scale;
- if (context.inIntro()) {
- curtainProjection.transform({
- x: x - tX,
- y: y - tY,
- k
- });
- }
- if (source) {
- _lastPointerEvent = event;
- }
- _isTransformed = true;
- _transformLast = eventTransform;
- utilSetTransform(supersurface, tX, tY, scale);
- scheduleRedraw();
- dispatch10.call("move", this, map2);
- function isInteger(val) {
- return typeof val === "number" && isFinite(val) && Math.floor(val) === val;
- }
- }
- function resetTransform() {
- if (!_isTransformed)
- return false;
- utilSetTransform(supersurface, 0, 0);
- _isTransformed = false;
- if (context.inIntro()) {
- curtainProjection.transform(projection2.transform());
- }
- return true;
+ });
}
- function redraw(difference, extent) {
- if (surface.empty() || !_redrawEnabled)
- return;
- if (resetTransform()) {
- difference = extent = void 0;
- }
- var zoom = map2.zoom();
- var z = String(~~zoom);
- if (surface.attr("data-zoom") !== z) {
- surface.attr("data-zoom", z);
- }
- var lat = map2.center()[1];
- var lowzoom = linear3().domain([-60, 0, 60]).range([17, 18.5, 17]).clamp(true);
- surface.classed("low-zoom", zoom <= lowzoom(lat));
- if (!difference) {
- supersurface.call(context.background());
- wrapper.call(drawLayers);
+ function filterData(detectedFeatures) {
+ const fromDate = context.photos().fromDate();
+ const toDate = context.photos().toDate();
+ if (fromDate) {
+ detectedFeatures = detectedFeatures.filter(function(feature3) {
+ return new Date(feature3.last_seen_at).getTime() >= new Date(fromDate).getTime();
+ });
}
- if (map2.editableDataEnabled() || map2.isInWideSelection()) {
- context.loadTiles(projection2);
- drawEditable(difference, extent);
- } else {
- editOff();
+ if (toDate) {
+ detectedFeatures = detectedFeatures.filter(function(feature3) {
+ return new Date(feature3.first_seen_at).getTime() <= new Date(toDate).getTime();
+ });
}
- _transformStart = projection2.transform();
- return map2;
+ return detectedFeatures;
}
- var immediateRedraw = function(difference, extent) {
- if (!difference && !extent)
- cancelPendingRedraw();
- redraw(difference, extent);
- };
- map2.lastPointerEvent = function() {
- return _lastPointerEvent;
- };
- map2.mouse = function(d3_event) {
- var event = d3_event || _lastPointerEvent;
- if (event) {
- var s;
- while (s = event.sourceEvent) {
- event = s;
+ function update() {
+ const service = getService();
+ let data = service ? service.mapFeatures(projection2) : [];
+ data = filterData(data);
+ const transform2 = svgPointTransform(projection2);
+ const mapFeatures = layer.selectAll(".icon-map-feature").data(data, function(d2) {
+ return d2.id;
+ });
+ mapFeatures.exit().remove();
+ const enter = mapFeatures.enter().append("g").attr("class", "icon-map-feature icon-detected").on("click", click);
+ enter.append("title").text(function(d2) {
+ var id2 = d2.value.replace(/--/g, ".").replace(/-/g, "_");
+ return _t("mapillary_map_features." + id2);
+ });
+ enter.append("use").attr("width", "24px").attr("height", "24px").attr("x", "-12px").attr("y", "-12px").attr("xlink:href", function(d2) {
+ if (d2.value === "object--billboard") {
+ return "#object--sign--advertisement";
}
- return _getMouseCoords(event);
+ return "#" + d2.value;
+ });
+ enter.append("rect").attr("width", "24px").attr("height", "24px").attr("x", "-12px").attr("y", "-12px");
+ mapFeatures.merge(enter).attr("transform", transform2);
+ }
+ function drawMapFeatures(selection2) {
+ const enabled = svgMapillaryMapFeatures.enabled;
+ const service = getService();
+ layer = selection2.selectAll(".layer-mapillary-map-features").data(service ? [0] : []);
+ layer.exit().remove();
+ layer = layer.enter().append("g").attr("class", "layer-mapillary-map-features layer-mapillary-detections").style("display", enabled ? "block" : "none").merge(layer);
+ if (enabled) {
+ if (service && ~~context.map().zoom() >= minZoom5) {
+ editOn();
+ update();
+ service.loadMapFeatures(projection2);
+ service.showFeatureDetections(true);
+ } else {
+ editOff();
+ }
+ } else if (service) {
+ service.showFeatureDetections(false);
}
- return null;
- };
- map2.mouseCoordinates = function() {
- var coord2 = map2.mouse() || pxCenter();
- return projection2.invert(coord2);
- };
- map2.dblclickZoomEnable = function(val) {
- if (!arguments.length)
- return _dblClickZoomEnabled;
- _dblClickZoomEnabled = val;
- return map2;
+ }
+ drawMapFeatures.enabled = function(_2) {
+ if (!arguments.length) return svgMapillaryMapFeatures.enabled;
+ svgMapillaryMapFeatures.enabled = _2;
+ if (svgMapillaryMapFeatures.enabled) {
+ showLayer();
+ context.photos().on("change.mapillary_map_features", update);
+ } else {
+ hideLayer();
+ context.photos().on("change.mapillary_map_features", null);
+ }
+ dispatch14.call("change");
+ return this;
};
- map2.redrawEnable = function(val) {
- if (!arguments.length)
- return _redrawEnabled;
- _redrawEnabled = val;
- return map2;
+ drawMapFeatures.supported = function() {
+ return !!getService();
};
- map2.isTransformed = function() {
- return _isTransformed;
+ drawMapFeatures.rendered = function(zoom) {
+ return zoom >= minZoom5;
};
- function setTransform(t2, duration, force) {
- var t = projection2.transform();
- if (!force && t2.k === t.k && t2.x === t.x && t2.y === t.y)
- return false;
- if (duration) {
- _selection.transition().duration(duration).on("start", function() {
- map2.startEase();
- }).call(_zoomerPanner.transform, identity2.translate(t2.x, t2.y).scale(t2.k));
- } else {
- projection2.transform(t2);
- _transformStart = t2;
- _selection.call(_zoomerPanner.transform, _transformStart);
+ init2();
+ return drawMapFeatures;
+ }
+
+ // modules/svg/kartaview_images.js
+ function svgKartaviewImages(projection2, context, dispatch14) {
+ var throttledRedraw = throttle_default(function() {
+ dispatch14.call("change");
+ }, 1e3);
+ var minZoom5 = 12;
+ var minMarkerZoom = 16;
+ var minViewfieldZoom2 = 18;
+ var layer = select_default2(null);
+ var _kartaview;
+ function init2() {
+ if (svgKartaviewImages.initialized) return;
+ svgKartaviewImages.enabled = false;
+ svgKartaviewImages.initialized = true;
+ }
+ function getService() {
+ if (services.kartaview && !_kartaview) {
+ _kartaview = services.kartaview;
+ _kartaview.event.on("loadedImages", throttledRedraw);
+ } else if (!services.kartaview && _kartaview) {
+ _kartaview = null;
}
- return true;
+ return _kartaview;
}
- function setCenterZoom(loc2, z2, duration, force) {
- var c = map2.center();
- var z = map2.zoom();
- if (loc2[0] === c[0] && loc2[1] === c[1] && z2 === z && !force)
- return false;
- var proj = geoRawMercator().transform(projection2.transform());
- var k2 = clamp(geoZoomToScale(z2, TILESIZE), kMin, kMax);
- proj.scale(k2);
- var t = proj.translate();
- var point = proj(loc2);
- var center = pxCenter();
- t[0] += center[0] - point[0];
- t[1] += center[1] - point[1];
- return setTransform(identity2.translate(t[0], t[1]).scale(k2), duration, force);
+ function showLayer() {
+ var service = getService();
+ if (!service) return;
+ editOn();
+ layer.style("opacity", 0).transition().duration(250).style("opacity", 1).on("end", function() {
+ dispatch14.call("change");
+ });
}
- map2.pan = function(delta, duration) {
- var t = projection2.translate();
- var k = projection2.scale();
- t[0] += delta[0];
- t[1] += delta[1];
- if (duration) {
- _selection.transition().duration(duration).on("start", function() {
- map2.startEase();
- }).call(_zoomerPanner.transform, identity2.translate(t[0], t[1]).scale(k));
- } else {
- projection2.translate(t);
- _transformStart = projection2.transform();
- _selection.call(_zoomerPanner.transform, _transformStart);
- dispatch10.call("move", this, map2);
- immediateRedraw();
- }
- return map2;
- };
- map2.dimensions = function(val) {
- if (!arguments.length)
- return _dimensions;
- _dimensions = val;
- drawLayers.dimensions(_dimensions);
- context.background().dimensions(_dimensions);
- projection2.clipExtent([[0, 0], _dimensions]);
- _getMouseCoords = utilFastMouse(supersurface.node());
- scheduleRedraw();
- return map2;
- };
- function zoomIn(delta) {
- setCenterZoom(map2.center(), ~~map2.zoom() + delta, 250, true);
+ function hideLayer() {
+ throttledRedraw.cancel();
+ layer.transition().duration(250).style("opacity", 0).on("end", editOff);
}
- function zoomOut(delta) {
- setCenterZoom(map2.center(), ~~map2.zoom() - delta, 250, true);
+ function editOn() {
+ layer.style("display", "block");
}
- map2.zoomIn = function() {
- zoomIn(1);
- };
- map2.zoomInFurther = function() {
- zoomIn(4);
- };
- map2.canZoomIn = function() {
- return map2.zoom() < maxZoom;
- };
- map2.zoomOut = function() {
- zoomOut(1);
- };
- map2.zoomOutFurther = function() {
- zoomOut(4);
- };
- map2.canZoomOut = function() {
- return map2.zoom() > minZoom2;
- };
- map2.center = function(loc2) {
- if (!arguments.length) {
- return projection2.invert(pxCenter());
- }
- if (setCenterZoom(loc2, map2.zoom())) {
- dispatch10.call("move", this, map2);
- }
- scheduleRedraw();
- return map2;
- };
- map2.unobscuredCenterZoomEase = function(loc, zoom) {
- var offset = map2.unobscuredOffsetPx();
- var proj = geoRawMercator().transform(projection2.transform());
- proj.scale(geoZoomToScale(zoom, TILESIZE));
- var locPx = proj(loc);
- var offsetLocPx = [locPx[0] + offset[0], locPx[1] + offset[1]];
- var offsetLoc = proj.invert(offsetLocPx);
- map2.centerZoomEase(offsetLoc, zoom);
- };
- map2.unobscuredOffsetPx = function() {
- var openPane = context.container().select(".map-panes .map-pane.shown");
- if (!openPane.empty()) {
- return [openPane.node().offsetWidth / 2, 0];
+ function editOff() {
+ layer.selectAll(".viewfield-group").remove();
+ layer.style("display", "none");
+ }
+ function click(d3_event, d2) {
+ var service = getService();
+ if (!service) return;
+ service.ensureViewerLoaded(context).then(function() {
+ service.selectImage(context, d2.key).showViewer(context);
+ });
+ context.map().centerEase(d2.loc);
+ }
+ function mouseover(d3_event, d2) {
+ var service = getService();
+ if (service) service.setStyles(context, d2);
+ }
+ function mouseout() {
+ var service = getService();
+ if (service) service.setStyles(context, null);
+ }
+ function transform2(d2) {
+ var t2 = svgPointTransform(projection2)(d2);
+ if (d2.ca) {
+ t2 += " rotate(" + Math.floor(d2.ca) + ",0,0)";
}
- return [0, 0];
- };
- map2.zoom = function(z2) {
- if (!arguments.length) {
- return Math.max(geoScaleToZoom(projection2.scale(), TILESIZE), 0);
+ return t2;
+ }
+ function filterImages(images) {
+ var fromDate = context.photos().fromDate();
+ var toDate = context.photos().toDate();
+ var usernames = context.photos().usernames();
+ if (fromDate) {
+ var fromTimestamp = new Date(fromDate).getTime();
+ images = images.filter(function(item) {
+ return new Date(item.captured_at).getTime() >= fromTimestamp;
+ });
}
- if (z2 < _minzoom) {
- surface.interrupt();
- dispatch10.call("hitMinZoom", this, map2);
- z2 = context.minEditableZoom();
+ if (toDate) {
+ var toTimestamp = new Date(toDate).getTime();
+ images = images.filter(function(item) {
+ return new Date(item.captured_at).getTime() <= toTimestamp;
+ });
}
- if (setCenterZoom(map2.center(), z2)) {
- dispatch10.call("move", this, map2);
+ if (usernames) {
+ images = images.filter(function(item) {
+ return usernames.indexOf(item.captured_by) !== -1;
+ });
}
- scheduleRedraw();
- return map2;
- };
- map2.centerZoom = function(loc2, z2) {
- if (setCenterZoom(loc2, z2)) {
- dispatch10.call("move", this, map2);
+ return images;
+ }
+ function filterSequences(sequences) {
+ var fromDate = context.photos().fromDate();
+ var toDate = context.photos().toDate();
+ var usernames = context.photos().usernames();
+ if (fromDate) {
+ var fromTimestamp = new Date(fromDate).getTime();
+ sequences = sequences.filter(function(image) {
+ return new Date(image.properties.captured_at).getTime() >= fromTimestamp;
+ });
}
- scheduleRedraw();
- return map2;
- };
- map2.zoomTo = function(entity) {
- var extent = entity.extent(context.graph());
- if (!isFinite(extent.area()))
- return map2;
- var z2 = clamp(map2.trimmedExtentZoom(extent), 0, 20);
- return map2.centerZoom(extent.center(), z2);
- };
- map2.centerEase = function(loc2, duration) {
- duration = duration || 250;
- setCenterZoom(loc2, map2.zoom(), duration);
- return map2;
- };
- map2.zoomEase = function(z2, duration) {
- duration = duration || 250;
- setCenterZoom(map2.center(), z2, duration, false);
- return map2;
- };
- map2.centerZoomEase = function(loc2, z2, duration) {
- duration = duration || 250;
- setCenterZoom(loc2, z2, duration, false);
- return map2;
- };
- map2.transformEase = function(t2, duration) {
- duration = duration || 250;
- setTransform(t2, duration, false);
- return map2;
- };
- map2.zoomToEase = function(obj, duration) {
- var extent;
- if (Array.isArray(obj)) {
- obj.forEach(function(entity) {
- var entityExtent = entity.extent(context.graph());
- if (!extent) {
- extent = entityExtent;
- } else {
- extent = extent.extend(entityExtent);
- }
+ if (toDate) {
+ var toTimestamp = new Date(toDate).getTime();
+ sequences = sequences.filter(function(image) {
+ return new Date(image.properties.captured_at).getTime() <= toTimestamp;
});
- } else {
- extent = obj.extent(context.graph());
}
- if (!isFinite(extent.area()))
- return map2;
- var z2 = clamp(map2.trimmedExtentZoom(extent), 0, 20);
- return map2.centerZoomEase(extent.center(), z2, duration);
- };
- map2.startEase = function() {
- utilBindOnce(surface, _pointerPrefix + "down.ease", function() {
- map2.cancelEase();
- });
- return map2;
- };
- map2.cancelEase = function() {
- _selection.interrupt();
- return map2;
- };
- map2.extent = function(val) {
- if (!arguments.length) {
- return new geoExtent(projection2.invert([0, _dimensions[1]]), projection2.invert([_dimensions[0], 0]));
- } else {
- var extent = geoExtent(val);
- map2.centerZoom(extent.center(), map2.extentZoom(extent));
+ if (usernames) {
+ sequences = sequences.filter(function(image) {
+ return usernames.indexOf(image.properties.captured_by) !== -1;
+ });
}
- };
- map2.trimmedExtent = function(val) {
- if (!arguments.length) {
- var headerY = 71;
- var footerY = 30;
- var pad2 = 10;
- return new geoExtent(projection2.invert([pad2, _dimensions[1] - footerY - pad2]), projection2.invert([_dimensions[0] - pad2, headerY + pad2]));
- } else {
- var extent = geoExtent(val);
- map2.centerZoom(extent.center(), map2.trimmedExtentZoom(extent));
+ return sequences;
+ }
+ function update() {
+ var viewer = context.container().select(".photoviewer");
+ var selected = viewer.empty() ? void 0 : viewer.datum();
+ var z2 = ~~context.map().zoom();
+ var showMarkers = z2 >= minMarkerZoom;
+ var showViewfields = z2 >= minViewfieldZoom2;
+ var service = getService();
+ var sequences = [];
+ var images = [];
+ if (context.photos().showsFlat()) {
+ sequences = service ? service.sequences(projection2) : [];
+ images = service && showMarkers ? service.images(projection2) : [];
+ sequences = filterSequences(sequences);
+ images = filterImages(images);
}
- };
- function calcExtentZoom(extent, dim) {
- var tl = projection2([extent[0][0], extent[1][1]]);
- var br = projection2([extent[1][0], extent[0][1]]);
- var hFactor = (br[0] - tl[0]) / dim[0];
- var vFactor = (br[1] - tl[1]) / dim[1];
- var hZoomDiff = Math.log(Math.abs(hFactor)) / Math.LN2;
- var vZoomDiff = Math.log(Math.abs(vFactor)) / Math.LN2;
- var newZoom = map2.zoom() - Math.max(hZoomDiff, vZoomDiff);
- return newZoom;
+ var traces = layer.selectAll(".sequences").selectAll(".sequence").data(sequences, function(d2) {
+ return d2.properties.key;
+ });
+ traces.exit().remove();
+ traces = traces.enter().append("path").attr("class", "sequence").merge(traces).attr("d", svgPath(projection2).geojson);
+ var groups = layer.selectAll(".markers").selectAll(".viewfield-group").data(images, function(d2) {
+ return d2.key;
+ });
+ groups.exit().remove();
+ var groupsEnter = groups.enter().append("g").attr("class", "viewfield-group").on("mouseenter", mouseover).on("mouseleave", mouseout).on("click", click);
+ groupsEnter.append("g").attr("class", "viewfield-scale");
+ var markers = groups.merge(groupsEnter).sort(function(a2, b2) {
+ return a2 === selected ? 1 : b2 === selected ? -1 : b2.loc[1] - a2.loc[1];
+ }).attr("transform", transform2).select(".viewfield-scale");
+ markers.selectAll("circle").data([0]).enter().append("circle").attr("dx", "0").attr("dy", "0").attr("r", "6");
+ var viewfields = markers.selectAll(".viewfield").data(showViewfields ? [0] : []);
+ viewfields.exit().remove();
+ viewfields.enter().insert("path", "circle").attr("class", "viewfield").attr("transform", "scale(1.5,1.5),translate(-8, -13)").attr("d", "M 6,9 C 8,8.4 8,8.4 10,9 L 16,-2 C 12,-5 4,-5 0,-2 z");
}
- map2.extentZoom = function(val) {
- return calcExtentZoom(geoExtent(val), _dimensions);
- };
- map2.trimmedExtentZoom = function(val) {
- var trimY = 120;
- var trimX = 40;
- var trimmed = [_dimensions[0] - trimX, _dimensions[1] - trimY];
- return calcExtentZoom(geoExtent(val), trimmed);
- };
- map2.withinEditableZoom = function() {
- return map2.zoom() >= context.minEditableZoom();
- };
- map2.isInWideSelection = function() {
- return !map2.withinEditableZoom() && context.selectedIDs().length;
- };
- map2.editableDataEnabled = function(skipZoomCheck) {
- var layer = context.layers().layer("osm");
- if (!layer || !layer.enabled())
- return false;
- return skipZoomCheck || map2.withinEditableZoom();
- };
- map2.notesEditable = function() {
- var layer = context.layers().layer("notes");
- if (!layer || !layer.enabled())
- return false;
- return map2.withinEditableZoom();
- };
- map2.minzoom = function(val) {
- if (!arguments.length)
- return _minzoom;
- _minzoom = val;
- return map2;
- };
- map2.toggleHighlightEdited = function() {
- surface.classed("highlight-edited", !surface.classed("highlight-edited"));
- map2.pan([0, 0]);
- dispatch10.call("changeHighlighting", this);
- };
- map2.areaFillOptions = ["wireframe", "partial", "full"];
- map2.activeAreaFill = function(val) {
- if (!arguments.length)
- return corePreferences("area-fill") || "partial";
- corePreferences("area-fill", val);
- if (val !== "wireframe") {
- corePreferences("area-fill-toggle", val);
+ function drawImages(selection2) {
+ var enabled = svgKartaviewImages.enabled, service = getService();
+ layer = selection2.selectAll(".layer-kartaview").data(service ? [0] : []);
+ layer.exit().remove();
+ var layerEnter = layer.enter().append("g").attr("class", "layer-kartaview").style("display", enabled ? "block" : "none");
+ layerEnter.append("g").attr("class", "sequences");
+ layerEnter.append("g").attr("class", "markers");
+ layer = layerEnter.merge(layer);
+ if (enabled) {
+ if (service && ~~context.map().zoom() >= minZoom5) {
+ editOn();
+ update();
+ service.loadImages(projection2);
+ } else {
+ editOff();
+ }
}
- updateAreaFill();
- map2.pan([0, 0]);
- dispatch10.call("changeAreaFill", this);
- return map2;
- };
- map2.toggleWireframe = function() {
- var activeFill = map2.activeAreaFill();
- if (activeFill === "wireframe") {
- activeFill = corePreferences("area-fill-toggle") || "partial";
+ }
+ drawImages.enabled = function(_2) {
+ if (!arguments.length) return svgKartaviewImages.enabled;
+ svgKartaviewImages.enabled = _2;
+ if (svgKartaviewImages.enabled) {
+ showLayer();
+ context.photos().on("change.kartaview_images", update);
} else {
- activeFill = "wireframe";
+ hideLayer();
+ context.photos().on("change.kartaview_images", null);
}
- map2.activeAreaFill(activeFill);
+ dispatch14.call("change");
+ return this;
};
- function updateAreaFill() {
- var activeFill = map2.activeAreaFill();
- map2.areaFillOptions.forEach(function(opt) {
- surface.classed("fill-" + opt, Boolean(opt === activeFill));
- });
- }
- map2.layers = () => drawLayers;
- map2.doubleUpHandler = function() {
- return _doubleUpHandler;
+ drawImages.supported = function() {
+ return !!getService();
};
- return utilRebind(map2, dispatch10, "on");
+ drawImages.rendered = function(zoom) {
+ return zoom >= minZoom5;
+ };
+ init2();
+ return drawImages;
}
- // modules/renderer/photos.js
- function rendererPhotos(context) {
- var dispatch10 = dispatch_default("change");
- var _layerIDs = ["streetside", "mapillary", "mapillary-map-features", "mapillary-signs", "kartaview"];
- var _allPhotoTypes = ["flat", "panoramic"];
- var _shownPhotoTypes = _allPhotoTypes.slice();
- var _dateFilters = ["fromDate", "toDate"];
- var _fromDate;
- var _toDate;
- var _usernames;
- function photos() {
+ // modules/svg/mapilio_images.js
+ function svgMapilioImages(projection2, context, dispatch14) {
+ const throttledRedraw = throttle_default(function() {
+ dispatch14.call("change");
+ }, 1e3);
+ const minZoom5 = 12;
+ let layer = select_default2(null);
+ let _mapilio;
+ const viewFieldZoomLevel = 18;
+ function init2() {
+ if (svgMapilioImages.initialized) return;
+ svgMapilioImages.enabled = false;
+ svgMapilioImages.initialized = true;
}
- function updateStorage() {
- if (window.mocha)
- return;
- var hash = utilStringQs(window.location.hash);
- var enabled = context.layers().all().filter(function(d) {
- return _layerIDs.indexOf(d.id) !== -1 && d.layer && d.layer.supported() && d.layer.enabled();
- }).map(function(d) {
- return d.id;
- });
- if (enabled.length) {
- hash.photo_overlay = enabled.join(",");
- } else {
- delete hash.photo_overlay;
+ function getService() {
+ if (services.mapilio && !_mapilio) {
+ _mapilio = services.mapilio;
+ _mapilio.event.on("loadedImages", throttledRedraw);
+ } else if (!services.mapilio && _mapilio) {
+ _mapilio = null;
}
- window.location.replace("#" + utilQsString(hash, true));
+ return _mapilio;
}
- photos.overlayLayerIDs = function() {
- return _layerIDs;
- };
- photos.allPhotoTypes = function() {
- return _allPhotoTypes;
- };
- photos.dateFilters = function() {
- return _dateFilters;
- };
- photos.dateFilterValue = function(val) {
- return val === _dateFilters[0] ? _fromDate : _toDate;
- };
- photos.setDateFilter = function(type3, val, updateUrl) {
- var date = val && new Date(val);
- if (date && !isNaN(date)) {
- val = date.toISOString().substr(0, 10);
- } else {
- val = null;
- }
- if (type3 === _dateFilters[0]) {
- _fromDate = val;
- if (_fromDate && _toDate && new Date(_toDate) < new Date(_fromDate)) {
- _toDate = _fromDate;
- }
- }
- if (type3 === _dateFilters[1]) {
- _toDate = val;
- if (_fromDate && _toDate && new Date(_toDate) < new Date(_fromDate)) {
- _fromDate = _toDate;
- }
- }
- dispatch10.call("change", this);
- if (updateUrl) {
- var rangeString;
- if (_fromDate || _toDate) {
- rangeString = (_fromDate || "") + "_" + (_toDate || "");
- }
- setUrlFilterValue("photo_dates", rangeString);
- }
- };
- photos.setUsernameFilter = function(val, updateUrl) {
- if (val && typeof val === "string")
- val = val.replace(/;/g, ",").split(",");
- if (val) {
- val = val.map((d) => d.trim()).filter(Boolean);
- if (!val.length) {
- val = null;
- }
+ function showLayer() {
+ const service = getService();
+ if (!service) return;
+ editOn();
+ layer.style("opacity", 0).transition().duration(250).style("opacity", 1).on("end", function() {
+ dispatch14.call("change");
+ });
+ }
+ function hideLayer() {
+ throttledRedraw.cancel();
+ layer.transition().duration(250).style("opacity", 0).on("end", editOff);
+ }
+ function transform2(d2) {
+ let t2 = svgPointTransform(projection2)(d2);
+ if (d2.heading) {
+ t2 += " rotate(" + Math.floor(d2.heading) + ",0,0)";
}
- _usernames = val;
- dispatch10.call("change", this);
- if (updateUrl) {
- var hashString;
- if (_usernames) {
- hashString = _usernames.join(",");
+ return t2;
+ }
+ function editOn() {
+ layer.style("display", "block");
+ }
+ function editOff() {
+ layer.selectAll(".viewfield-group").remove();
+ layer.style("display", "none");
+ }
+ function click(d3_event, image) {
+ const service = getService();
+ if (!service) return;
+ service.ensureViewerLoaded(context, image.id).then(function() {
+ service.selectImage(context, image.id).showViewer(context);
+ });
+ context.map().centerEase(image.loc);
+ }
+ function mouseover(d3_event, image) {
+ const service = getService();
+ if (service) service.setStyles(context, image);
+ }
+ function mouseout() {
+ const service = getService();
+ if (service) service.setStyles(context, null);
+ }
+ function update() {
+ const z2 = ~~context.map().zoom();
+ const showViewfields = z2 >= viewFieldZoomLevel;
+ const service = getService();
+ let sequences = service ? service.sequences(projection2) : [];
+ let images = service ? service.images(projection2) : [];
+ let traces = layer.selectAll(".sequences").selectAll(".sequence").data(sequences, function(d2) {
+ return d2.properties.id;
+ });
+ traces.exit().remove();
+ traces.enter().append("path").attr("class", "sequence").merge(traces).attr("d", svgPath(projection2).geojson);
+ const groups = layer.selectAll(".markers").selectAll(".viewfield-group").data(images, function(d2) {
+ return d2.id;
+ });
+ groups.exit().remove();
+ const groupsEnter = groups.enter().append("g").attr("class", "viewfield-group").on("mouseenter", mouseover).on("mouseleave", mouseout).on("click", click);
+ groupsEnter.append("g").attr("class", "viewfield-scale");
+ const markers = groups.merge(groupsEnter).sort(function(a2, b2) {
+ return b2.loc[1] - a2.loc[1];
+ }).attr("transform", transform2).select(".viewfield-scale");
+ markers.selectAll("circle").data([0]).enter().append("circle").attr("dx", "0").attr("dy", "0").attr("r", "6");
+ const viewfields = markers.selectAll(".viewfield").data(showViewfields ? [0] : []);
+ viewfields.exit().remove();
+ viewfields.enter().insert("path", "circle").attr("class", "viewfield").attr("transform", "scale(1.5,1.5),translate(-8, -13)").attr("d", viewfieldPath);
+ function viewfieldPath() {
+ if (this.parentNode.__data__.isPano) {
+ return "M 8,13 m -10,0 a 10,10 0 1,0 20,0 a 10,10 0 1,0 -20,0";
+ } else {
+ return "M 6,9 C 8,8.4 8,8.4 10,9 L 16,-2 C 12,-5 4,-5 0,-2 z";
}
- setUrlFilterValue("photo_username", hashString);
}
- };
- function setUrlFilterValue(property, val) {
- if (!window.mocha) {
- var hash = utilStringQs(window.location.hash);
- if (val) {
- if (hash[property] === val)
- return;
- hash[property] = val;
+ }
+ function drawImages(selection2) {
+ const enabled = svgMapilioImages.enabled;
+ const service = getService();
+ layer = selection2.selectAll(".layer-mapilio").data(service ? [0] : []);
+ layer.exit().remove();
+ const layerEnter = layer.enter().append("g").attr("class", "layer-mapilio").style("display", enabled ? "block" : "none");
+ layerEnter.append("g").attr("class", "sequences");
+ layerEnter.append("g").attr("class", "markers");
+ layer = layerEnter.merge(layer);
+ if (enabled) {
+ if (service && ~~context.map().zoom() >= minZoom5) {
+ editOn();
+ update();
+ service.loadImages(projection2);
+ service.loadLines(projection2);
} else {
- if (!(property in hash))
- return;
- delete hash[property];
+ editOff();
}
- window.location.replace("#" + utilQsString(hash, true));
}
}
- function showsLayer(id2) {
- var layer = context.layers().layer(id2);
- return layer && layer.supported() && layer.enabled();
- }
- photos.shouldFilterByDate = function() {
- return showsLayer("mapillary") || showsLayer("kartaview") || showsLayer("streetside");
- };
- photos.shouldFilterByPhotoType = function() {
- return showsLayer("mapillary") || showsLayer("streetside") && showsLayer("kartaview");
- };
- photos.shouldFilterByUsername = function() {
- return !showsLayer("mapillary") && showsLayer("kartaview") && !showsLayer("streetside");
- };
- photos.showsPhotoType = function(val) {
- if (!photos.shouldFilterByPhotoType())
- return true;
- return _shownPhotoTypes.indexOf(val) !== -1;
- };
- photos.showsFlat = function() {
- return photos.showsPhotoType("flat");
- };
- photos.showsPanoramic = function() {
- return photos.showsPhotoType("panoramic");
- };
- photos.fromDate = function() {
- return _fromDate;
- };
- photos.toDate = function() {
- return _toDate;
- };
- photos.togglePhotoType = function(val) {
- var index = _shownPhotoTypes.indexOf(val);
- if (index !== -1) {
- _shownPhotoTypes.splice(index, 1);
+ drawImages.enabled = function(_2) {
+ if (!arguments.length) return svgMapilioImages.enabled;
+ svgMapilioImages.enabled = _2;
+ if (svgMapilioImages.enabled) {
+ showLayer();
+ context.photos().on("change.mapilio_images", update);
} else {
- _shownPhotoTypes.push(val);
+ hideLayer();
+ context.photos().on("change.mapilio_images", null);
}
- dispatch10.call("change", this);
- return photos;
+ dispatch14.call("change");
+ return this;
};
- photos.usernames = function() {
- return _usernames;
+ drawImages.supported = function() {
+ return !!getService();
};
- photos.init = function() {
- var hash = utilStringQs(window.location.hash);
- if (hash.photo_dates) {
- var parts = /^(.*)[â_](.*)$/g.exec(hash.photo_dates.trim());
- this.setDateFilter("fromDate", parts && parts.length >= 2 && parts[1], false);
- this.setDateFilter("toDate", parts && parts.length >= 3 && parts[2], false);
+ drawImages.rendered = function(zoom) {
+ return zoom >= minZoom5;
+ };
+ init2();
+ return drawImages;
+ }
+
+ // modules/svg/panoramax_images.js
+ function svgPanoramaxImages(projection2, context, dispatch14) {
+ const throttledRedraw = throttle_default(function() {
+ dispatch14.call("change");
+ }, 1e3);
+ const imageMinZoom2 = 15;
+ const lineMinZoom2 = 10;
+ const viewFieldZoomLevel = 18;
+ let layer = select_default2(null);
+ let _panoramax;
+ let _viewerYaw = 0;
+ let _selectedSequence;
+ let _activeUsernameFilter;
+ let _activeIds;
+ function init2() {
+ if (svgPanoramaxImages.initialized) return;
+ svgPanoramaxImages.enabled = false;
+ svgPanoramaxImages.initialized = true;
+ }
+ function getService() {
+ if (services.panoramax && !_panoramax) {
+ _panoramax = services.panoramax;
+ _panoramax.event.on("viewerChanged", viewerChanged).on("loadedLines", throttledRedraw).on("loadedImages", throttledRedraw);
+ } else if (!services.panoramax && _panoramax) {
+ _panoramax = null;
+ }
+ return _panoramax;
+ }
+ async function filterImages(images) {
+ const showsPano = context.photos().showsPanoramic();
+ const showsFlat = context.photos().showsFlat();
+ const fromDate = context.photos().fromDate();
+ const toDate = context.photos().toDate();
+ const username = context.photos().usernames();
+ const service = getService();
+ if (!showsPano || !showsFlat) {
+ images = images.filter(function(image) {
+ if (image.isPano) return showsPano;
+ return showsFlat;
+ });
}
- if (hash.photo_username) {
- this.setUsernameFilter(hash.photo_username, false);
+ if (fromDate) {
+ images = images.filter(function(image) {
+ return new Date(image.capture_time).getTime() >= new Date(fromDate).getTime();
+ });
}
- if (hash.photo_overlay) {
- var hashOverlayIDs = hash.photo_overlay.replace(/;/g, ",").split(",");
- hashOverlayIDs.forEach(function(id2) {
- if (id2 === "openstreetcam")
- id2 = "kartaview";
- var layer2 = _layerIDs.indexOf(id2) !== -1 && context.layers().layer(id2);
- if (layer2 && !layer2.enabled())
- layer2.enabled(true);
+ if (toDate) {
+ images = images.filter(function(image) {
+ return new Date(image.capture_time).getTime() <= new Date(toDate).getTime();
});
}
- if (hash.photo) {
- var photoIds = hash.photo.replace(/;/g, ",").split(",");
- var photoId = photoIds.length && photoIds[0].trim();
- var results = /(.*)\/(.*)/g.exec(photoId);
- if (results && results.length >= 3) {
- var serviceId = results[1];
- if (serviceId === "openstreetcam")
- serviceId = "kartaview";
- var photoKey = results[2];
- var service = services[serviceId];
- if (service && service.ensureViewerLoaded) {
- var layer = _layerIDs.indexOf(serviceId) !== -1 && context.layers().layer(serviceId);
- if (layer && !layer.enabled())
- layer.enabled(true);
- var baselineTime = Date.now();
- service.on("loadedImages.rendererPhotos", function() {
- if (Date.now() - baselineTime > 45e3) {
- service.on("loadedImages.rendererPhotos", null);
- return;
- }
- if (!service.cachedImage(photoKey))
- return;
- service.on("loadedImages.rendererPhotos", null);
- service.ensureViewerLoaded(context).then(function() {
- service.selectImage(context, photoKey).showViewer(context);
- });
- });
- }
+ if (username && service) {
+ if (_activeUsernameFilter !== username) {
+ _activeUsernameFilter = username;
+ const tempIds = await service.getUserIds(username);
+ _activeIds = {};
+ tempIds.forEach((id2) => {
+ _activeIds[id2] = true;
+ });
}
+ images = images.filter(function(image) {
+ return _activeIds[image.account_id];
+ });
}
- context.layers().on("change.rendererPhotos", updateStorage);
- };
- return utilRebind(photos, dispatch10, "on");
- }
-
- // modules/ui/account.js
- function uiAccount(context) {
- const osm = context.connection();
- function updateUserDetails(selection2) {
- if (!osm)
- return;
- if (!osm.authenticated()) {
- render(selection2, null);
- } else {
- osm.userDetails((err, user) => render(selection2, user));
- }
+ return images;
}
- function render(selection2, user) {
- let userInfo = selection2.select(".userInfo");
- let loginLogout = selection2.select(".loginLogout");
- if (user) {
- userInfo.html("").classed("hide", false);
- let userLink = userInfo.append("a").attr("href", osm.userURL(user.display_name)).attr("target", "_blank");
- if (user.image_url) {
- userLink.append("img").attr("class", "icon pre-text user-icon").attr("src", user.image_url);
- } else {
- userLink.call(svgIcon("#iD-icon-avatar", "pre-text light"));
- }
- userLink.append("span").attr("class", "label").html(user.display_name);
- loginLogout.classed("hide", false).select("a").text(_t("logout")).on("click", (e) => {
- e.preventDefault();
- osm.logout();
- tryLogout();
+ async function filterSequences(sequences) {
+ const showsPano = context.photos().showsPanoramic();
+ const showsFlat = context.photos().showsFlat();
+ const fromDate = context.photos().fromDate();
+ const toDate = context.photos().toDate();
+ const username = context.photos().usernames();
+ const service = getService();
+ if (!showsPano || !showsFlat) {
+ sequences = sequences.filter(function(sequence) {
+ if (sequence.properties.type === "equirectangular") return showsPano;
+ return showsFlat;
});
- } else {
- userInfo.html("").classed("hide", true);
- loginLogout.classed("hide", false).select("a").text(_t("login")).on("click", (e) => {
- e.preventDefault();
- osm.authenticate();
+ }
+ if (fromDate) {
+ sequences = sequences.filter(function(sequence) {
+ return new Date(sequence.properties.date).getTime() >= new Date(fromDate).getTime().toString();
});
}
- }
- function tryLogout() {
- if (!osm)
- return;
- const url = osm.getUrlRoot() + "/logout?referer=%2Flogin";
- const w = 600;
- const h = 550;
- const settings = [
- ["width", w],
- ["height", h],
- ["left", window.screen.width / 2 - w / 2],
- ["top", window.screen.height / 2 - h / 2]
- ].map((x) => x.join("=")).join(",");
- window.open(url, "_blank", settings);
- }
- return function(selection2) {
- if (!osm)
- return;
- selection2.append("li").attr("class", "userInfo").classed("hide", true);
- selection2.append("li").attr("class", "loginLogout").classed("hide", true).append("a").attr("href", "#");
- osm.on("change.account", () => updateUserDetails(selection2));
- updateUserDetails(selection2);
- };
- }
-
- // modules/ui/attribution.js
- function uiAttribution(context) {
- let _selection = select_default2(null);
- function render(selection2, data, klass) {
- let div = selection2.selectAll(`.${klass}`).data([0]);
- div = div.enter().append("div").attr("class", klass).merge(div);
- let attributions = div.selectAll(".attribution").data(data, (d) => d.id);
- attributions.exit().remove();
- attributions = attributions.enter().append("span").attr("class", "attribution").each((d, i2, nodes) => {
- let attribution = select_default2(nodes[i2]);
- if (d.terms_html) {
- attribution.html(d.terms_html);
- return;
- }
- if (d.terms_url) {
- attribution = attribution.append("a").attr("href", d.terms_url).attr("target", "_blank");
- }
- const sourceID = d.id.replace(/\./g, "");
- const terms_text = _t(`imagery.${sourceID}.attribution.text`, { default: d.terms_text || d.id || d.name() });
- if (d.icon && !d.overlay) {
- attribution.append("img").attr("class", "source-image").attr("src", d.icon);
+ if (toDate) {
+ sequences = sequences.filter(function(sequence) {
+ return new Date(sequence.properties.date).getTime() <= new Date(toDate).getTime().toString();
+ });
+ }
+ if (username && service) {
+ if (_activeUsernameFilter !== username) {
+ _activeUsernameFilter = username;
+ const tempIds = await service.getUserIds(username);
+ _activeIds = {};
+ tempIds.forEach((id2) => {
+ _activeIds[id2] = true;
+ });
}
- attribution.append("span").attr("class", "attribution-text").text(terms_text);
- }).merge(attributions);
- let copyright = attributions.selectAll(".copyright-notice").data((d) => {
- let notice = d.copyrightNotices(context.map().zoom(), context.map().extent());
- return notice ? [notice] : [];
+ sequences = sequences.filter(function(sequence) {
+ return _activeIds[sequence.properties.account_id];
+ });
+ }
+ return sequences;
+ }
+ function showLayer() {
+ const service = getService();
+ if (!service) return;
+ editOn();
+ layer.style("opacity", 0).transition().duration(250).style("opacity", 1).on("end", function() {
+ dispatch14.call("change");
});
- copyright.exit().remove();
- copyright = copyright.enter().append("span").attr("class", "copyright-notice").merge(copyright);
- copyright.text(String);
}
- function update() {
- let baselayer = context.background().baseLayerSource();
- _selection.call(render, baselayer ? [baselayer] : [], "base-layer-attribution");
- const z = context.map().zoom();
- let overlays = context.background().overlayLayerSources() || [];
- _selection.call(render, overlays.filter((s) => s.validZoom(z)), "overlay-layer-attribution");
+ function hideLayer() {
+ throttledRedraw.cancel();
+ layer.transition().duration(250).style("opacity", 0).on("end", editOff);
}
- return function(selection2) {
- _selection = selection2;
- context.background().on("change.attribution", update);
- context.map().on("move.attribution", throttle_default(update, 400, { leading: false }));
- update();
- };
- }
-
- // modules/ui/contributors.js
- function uiContributors(context) {
- var osm = context.connection(), debouncedUpdate = debounce_default(function() {
- update();
- }, 1e3), limit = 4, hidden = false, wrap2 = select_default2(null);
- function update() {
- if (!osm)
- return;
- var users = {}, entities = context.history().intersects(context.map().extent());
- entities.forEach(function(entity) {
- if (entity && entity.user)
- users[entity.user] = true;
- });
- var u = Object.keys(users), subset = u.slice(0, u.length > limit ? limit - 1 : limit);
- wrap2.html("").call(svgIcon("#iD-icon-nearby", "pre-text light"));
- var userList = select_default2(document.createElement("span"));
- userList.selectAll().data(subset).enter().append("a").attr("class", "user-link").attr("href", function(d) {
- return osm.userURL(d);
- }).attr("target", "_blank").text(String);
- if (u.length > limit) {
- var count = select_default2(document.createElement("span"));
- var othersNum = u.length - limit + 1;
- count.append("a").attr("target", "_blank").attr("href", function() {
- return osm.changesetsURL(context.map().center(), context.map().zoom());
- }).text(othersNum);
- wrap2.append("span").html(_t.html("contributors.truncated_list", { n: othersNum, users: { html: userList.html() }, count: { html: count.html() } }));
- } else {
- wrap2.append("span").html(_t.html("contributors.list", { users: { html: userList.html() } }));
+ function transform2(d2, selectedImageId) {
+ let t2 = svgPointTransform(projection2)(d2);
+ let rot = d2.heading;
+ if (d2.id === selectedImageId) {
+ rot += _viewerYaw;
}
- if (!u.length) {
- hidden = true;
- wrap2.transition().style("opacity", 0);
- } else if (hidden) {
- wrap2.transition().style("opacity", 1);
+ if (rot) {
+ t2 += " rotate(" + Math.floor(rot) + ",0,0)";
}
+ return t2;
}
- return function(selection2) {
- if (!osm)
- return;
- wrap2 = selection2;
- update();
- osm.on("loaded.contributors", debouncedUpdate);
- context.map().on("move.contributors", debouncedUpdate);
- };
- }
-
- // modules/ui/popover.js
- var _popoverID = 0;
- function uiPopover(klass) {
- var _id = _popoverID++;
- var _anchorSelection = select_default2(null);
- var popover = function(selection2) {
- _anchorSelection = selection2;
- selection2.each(setup);
- };
- var _animation = utilFunctor(false);
- var _placement = utilFunctor("top");
- var _alignment = utilFunctor("center");
- var _scrollContainer = utilFunctor(select_default2(null));
- var _content;
- var _displayType = utilFunctor("");
- var _hasArrow = utilFunctor(true);
- var _pointerPrefix = "PointerEvent" in window ? "pointer" : "mouse";
- popover.displayType = function(val) {
- if (arguments.length) {
- _displayType = utilFunctor(val);
- return popover;
- } else {
- return _displayType;
- }
- };
- popover.hasArrow = function(val) {
- if (arguments.length) {
- _hasArrow = utilFunctor(val);
- return popover;
- } else {
- return _hasArrow;
- }
- };
- popover.placement = function(val) {
- if (arguments.length) {
- _placement = utilFunctor(val);
- return popover;
- } else {
- return _placement;
+ function editOn() {
+ layer.style("display", "block");
+ }
+ function editOff() {
+ layer.selectAll(".viewfield-group").remove();
+ layer.style("display", "none");
+ }
+ function click(d3_event, image) {
+ const service = getService();
+ if (!service) return;
+ if (image.sequence_id !== _selectedSequence) {
+ _viewerYaw = 0;
}
- };
- popover.alignment = function(val) {
- if (arguments.length) {
- _alignment = utilFunctor(val);
- return popover;
- } else {
- return _alignment;
+ _selectedSequence = image.sequence_id;
+ service.ensureViewerLoaded(context).then(function() {
+ service.selectImage(context, image.id).showViewer(context);
+ });
+ context.map().centerEase(image.loc);
+ }
+ function mouseover(d3_event, image) {
+ const service = getService();
+ if (service) service.setStyles(context, image);
+ }
+ function mouseout() {
+ const service = getService();
+ if (service) service.setStyles(context, null);
+ }
+ async function update() {
+ var _a4;
+ const zoom = ~~context.map().zoom();
+ const showViewfields = zoom >= viewFieldZoomLevel;
+ const service = getService();
+ let sequences = service ? service.sequences(projection2, zoom) : [];
+ let images = service && zoom >= imageMinZoom2 ? service.images(projection2) : [];
+ images = await filterImages(images);
+ sequences = await filterSequences(sequences, service);
+ let traces = layer.selectAll(".sequences").selectAll(".sequence").data(sequences, function(d2) {
+ return d2.properties.id;
+ });
+ traces.exit().remove();
+ traces.enter().append("path").attr("class", "sequence").merge(traces).attr("d", svgPath(projection2).geojson);
+ const groups = layer.selectAll(".markers").selectAll(".viewfield-group").data(images, function(d2) {
+ return d2.id;
+ });
+ groups.exit().remove();
+ const groupsEnter = groups.enter().append("g").attr("class", "viewfield-group").on("mouseenter", mouseover).on("mouseleave", mouseout).on("click", click);
+ groupsEnter.append("g").attr("class", "viewfield-scale");
+ const activeImageId = (_a4 = service.getActiveImage()) == null ? void 0 : _a4.id;
+ const markers = groups.merge(groupsEnter).sort(function(a2, b2) {
+ if (a2.id === activeImageId) return 1;
+ if (b2.id === activeImageId) return -1;
+ return a2.capture_time_parsed - b2.capture_time_parsed;
+ }).attr("transform", (d2) => transform2(d2, activeImageId)).select(".viewfield-scale");
+ markers.selectAll("circle").data([0]).enter().append("circle").attr("dx", "0").attr("dy", "0").attr("r", "6");
+ const viewfields = markers.selectAll(".viewfield").data(showViewfields ? [0] : []);
+ viewfields.exit().remove();
+ viewfields.enter().insert("path", "circle").attr("class", "viewfield").attr("transform", "scale(1.5,1.5),translate(-8, -13)").attr("d", viewfieldPath);
+ service.setStyles(context, null);
+ function viewfieldPath() {
+ if (this.parentNode.__data__.isPano) {
+ return "M 8,13 m -10,0 a 10,10 0 1,0 20,0 a 10,10 0 1,0 -20,0";
+ } else {
+ return "M 6,9 C 8,8.4 8,8.4 10,9 L 16,-2 C 12,-5 4,-5 0,-2 z";
+ }
}
- };
- popover.scrollContainer = function(val) {
- if (arguments.length) {
- _scrollContainer = utilFunctor(val);
- return popover;
- } else {
- return _scrollContainer;
+ }
+ function viewerChanged() {
+ const service = getService();
+ if (!service) return;
+ const frame2 = service.photoFrame();
+ if (!frame2) return;
+ _viewerYaw = frame2.getYaw();
+ if (context.map().isTransformed()) return;
+ layer.selectAll(".viewfield-group.currentView").attr("transform", (d2) => transform2(d2, d2.id));
+ }
+ function drawImages(selection2) {
+ const enabled = svgPanoramaxImages.enabled;
+ const service = getService();
+ layer = selection2.selectAll(".layer-panoramax").data(service ? [0] : []);
+ layer.exit().remove();
+ const layerEnter = layer.enter().append("g").attr("class", "layer-panoramax").style("display", enabled ? "block" : "none");
+ layerEnter.append("g").attr("class", "sequences");
+ layerEnter.append("g").attr("class", "markers");
+ layer = layerEnter.merge(layer);
+ if (enabled) {
+ let zoom = ~~context.map().zoom();
+ if (service) {
+ if (zoom >= imageMinZoom2) {
+ editOn();
+ update();
+ service.loadImages(projection2);
+ } else if (zoom >= lineMinZoom2) {
+ editOn();
+ update();
+ service.loadLines(projection2, zoom);
+ } else {
+ editOff();
+ }
+ } else {
+ editOff();
+ }
}
- };
- popover.content = function(val) {
- if (arguments.length) {
- _content = val;
- return popover;
+ }
+ drawImages.enabled = function(_2) {
+ if (!arguments.length) return svgPanoramaxImages.enabled;
+ svgPanoramaxImages.enabled = _2;
+ if (svgPanoramaxImages.enabled) {
+ showLayer();
+ context.photos().on("change.panoramax_images", update);
} else {
- return _content;
+ hideLayer();
+ context.photos().on("change.panoramax_images", null);
}
+ dispatch14.call("change");
+ return this;
};
- popover.isShown = function() {
- var popoverSelection = _anchorSelection.select(".popover-" + _id);
- return !popoverSelection.empty() && popoverSelection.classed("in");
- };
- popover.show = function() {
- _anchorSelection.each(show);
- };
- popover.updateContent = function() {
- _anchorSelection.each(updateContent);
- };
- popover.hide = function() {
- _anchorSelection.each(hide);
- };
- popover.toggle = function() {
- _anchorSelection.each(toggle);
- };
- popover.destroy = function(selection2, selector) {
- selector = selector || ".popover-" + _id;
- selection2.on(_pointerPrefix + "enter.popover", null).on(_pointerPrefix + "leave.popover", null).on(_pointerPrefix + "up.popover", null).on(_pointerPrefix + "down.popover", null).on("click.popover", null).attr("title", function() {
- return this.getAttribute("data-original-title") || this.getAttribute("title");
- }).attr("data-original-title", null).selectAll(selector).remove();
+ drawImages.supported = function() {
+ return !!getService();
};
- popover.destroyAny = function(selection2) {
- selection2.call(popover.destroy, ".popover");
+ drawImages.rendered = function(zoom) {
+ return zoom >= lineMinZoom2;
};
- function setup() {
- var anchor = select_default2(this);
- var animate = _animation.apply(this, arguments);
- var popoverSelection = anchor.selectAll(".popover-" + _id).data([0]);
- var enter = popoverSelection.enter().append("div").attr("class", "popover popover-" + _id + " " + (klass ? klass : "")).classed("arrowed", _hasArrow.apply(this, arguments));
- enter.append("div").attr("class", "popover-arrow");
- enter.append("div").attr("class", "popover-inner");
- popoverSelection = enter.merge(popoverSelection);
- if (animate) {
- popoverSelection.classed("fade", true);
- }
- var display = _displayType.apply(this, arguments);
- if (display === "hover") {
- var _lastNonMouseEnterTime;
- anchor.on(_pointerPrefix + "enter.popover", function(d3_event) {
- if (d3_event.pointerType) {
- if (d3_event.pointerType !== "mouse") {
- _lastNonMouseEnterTime = d3_event.timeStamp;
- return;
- } else if (_lastNonMouseEnterTime && d3_event.timeStamp - _lastNonMouseEnterTime < 1500) {
- return;
- }
- }
- if (d3_event.buttons !== 0)
- return;
- show.apply(this, arguments);
- }).on(_pointerPrefix + "leave.popover", function() {
- hide.apply(this, arguments);
- }).on("focus.popover", function() {
- show.apply(this, arguments);
- }).on("blur.popover", function() {
- hide.apply(this, arguments);
- });
- } else if (display === "clickFocus") {
- anchor.on(_pointerPrefix + "down.popover", function(d3_event) {
- d3_event.preventDefault();
- d3_event.stopPropagation();
- }).on(_pointerPrefix + "up.popover", function(d3_event) {
- d3_event.preventDefault();
- d3_event.stopPropagation();
- }).on("click.popover", toggle);
- popoverSelection.attr("tabindex", 0).on("blur.popover", function() {
- anchor.each(function() {
- hide.apply(this, arguments);
- });
- });
- }
+ init2();
+ return drawImages;
+ }
+
+ // modules/svg/osm.js
+ function svgOsm(projection2, context, dispatch14) {
+ var enabled = true;
+ function drawOsm(selection2) {
+ selection2.selectAll(".layer-osm").data(["covered", "areas", "lines", "points", "labels"]).enter().append("g").attr("class", function(d2) {
+ return "layer-osm " + d2;
+ });
+ selection2.selectAll(".layer-osm.points").selectAll(".points-group").data(["points", "midpoints", "vertices", "turns"]).enter().append("g").attr("class", function(d2) {
+ return "points-group " + d2;
+ });
}
- function show() {
- var anchor = select_default2(this);
- var popoverSelection = anchor.selectAll(".popover-" + _id);
- if (popoverSelection.empty()) {
- anchor.call(popover.destroy);
- anchor.each(setup);
- popoverSelection = anchor.selectAll(".popover-" + _id);
+ function showLayer() {
+ var layer = context.surface().selectAll(".data-layer.osm");
+ layer.interrupt();
+ layer.classed("disabled", false).style("opacity", 0).transition().duration(250).style("opacity", 1).on("end interrupt", function() {
+ dispatch14.call("change");
+ });
+ }
+ function hideLayer() {
+ var layer = context.surface().selectAll(".data-layer.osm");
+ layer.interrupt();
+ layer.transition().duration(250).style("opacity", 0).on("end interrupt", function() {
+ layer.classed("disabled", true);
+ dispatch14.call("change");
+ });
+ }
+ drawOsm.enabled = function(val) {
+ if (!arguments.length) return enabled;
+ enabled = val;
+ if (enabled) {
+ showLayer();
+ } else {
+ hideLayer();
}
- popoverSelection.classed("in", true);
- var displayType = _displayType.apply(this, arguments);
- if (displayType === "clickFocus") {
- anchor.classed("active", true);
- popoverSelection.node().focus();
+ dispatch14.call("change");
+ return this;
+ };
+ return drawOsm;
+ }
+
+ // modules/svg/notes.js
+ var hash = utilStringQs(window.location.hash);
+ var _notesEnabled = !!hash.notes;
+ var _osmService;
+ function svgNotes(projection2, context, dispatch14) {
+ if (!dispatch14) {
+ dispatch14 = dispatch_default("change");
+ }
+ var throttledRedraw = throttle_default(function() {
+ dispatch14.call("change");
+ }, 1e3);
+ var minZoom5 = 12;
+ var touchLayer = select_default2(null);
+ var drawLayer = select_default2(null);
+ var _notesVisible = false;
+ function markerPath(selection2, klass) {
+ selection2.attr("class", klass).attr("transform", "translate(-8, -22)").attr("d", "m17.5,0l-15,0c-1.37,0 -2.5,1.12 -2.5,2.5l0,11.25c0,1.37 1.12,2.5 2.5,2.5l3.75,0l0,3.28c0,0.38 0.43,0.6 0.75,0.37l4.87,-3.65l5.62,0c1.37,0 2.5,-1.12 2.5,-2.5l0,-11.25c0,-1.37 -1.12,-2.5 -2.5,-2.5z");
+ }
+ function getService() {
+ if (services.osm && !_osmService) {
+ _osmService = services.osm;
+ _osmService.on("loadedNotes", throttledRedraw);
+ } else if (!services.osm && _osmService) {
+ _osmService = null;
}
- anchor.each(updateContent);
+ return _osmService;
}
- function updateContent() {
- var anchor = select_default2(this);
- if (_content) {
- anchor.selectAll(".popover-" + _id + " > .popover-inner").call(_content.apply(this, arguments));
+ function editOn() {
+ if (!_notesVisible) {
+ _notesVisible = true;
+ drawLayer.style("display", "block");
}
- updatePosition.apply(this, arguments);
- updatePosition.apply(this, arguments);
- updatePosition.apply(this, arguments);
}
- function updatePosition() {
- var anchor = select_default2(this);
- var popoverSelection = anchor.selectAll(".popover-" + _id);
- var scrollContainer = _scrollContainer && _scrollContainer.apply(this, arguments);
- var scrollNode = scrollContainer && !scrollContainer.empty() && scrollContainer.node();
- var scrollLeft = scrollNode ? scrollNode.scrollLeft : 0;
- var scrollTop = scrollNode ? scrollNode.scrollTop : 0;
- var placement = _placement.apply(this, arguments);
- popoverSelection.classed("left", false).classed("right", false).classed("top", false).classed("bottom", false).classed(placement, true);
- var alignment = _alignment.apply(this, arguments);
- var alignFactor = 0.5;
- if (alignment === "leading") {
- alignFactor = 0;
- } else if (alignment === "trailing") {
- alignFactor = 1;
+ function editOff() {
+ if (_notesVisible) {
+ _notesVisible = false;
+ drawLayer.style("display", "none");
+ drawLayer.selectAll(".note").remove();
+ touchLayer.selectAll(".note").remove();
}
- var anchorFrame = getFrame(anchor.node());
- var popoverFrame = getFrame(popoverSelection.node());
- var position;
- switch (placement) {
- case "top":
- position = {
- x: anchorFrame.x + (anchorFrame.w - popoverFrame.w) * alignFactor,
- y: anchorFrame.y - popoverFrame.h
- };
- break;
- case "bottom":
- position = {
- x: anchorFrame.x + (anchorFrame.w - popoverFrame.w) * alignFactor,
- y: anchorFrame.y + anchorFrame.h
- };
- break;
- case "left":
- position = {
- x: anchorFrame.x - popoverFrame.w,
- y: anchorFrame.y + (anchorFrame.h - popoverFrame.h) * alignFactor
- };
- break;
- case "right":
- position = {
- x: anchorFrame.x + anchorFrame.w,
- y: anchorFrame.y + (anchorFrame.h - popoverFrame.h) * alignFactor
- };
- break;
+ }
+ function layerOn() {
+ editOn();
+ drawLayer.style("opacity", 0).transition().duration(250).style("opacity", 1).on("end interrupt", function() {
+ dispatch14.call("change");
+ });
+ }
+ function layerOff() {
+ throttledRedraw.cancel();
+ drawLayer.interrupt();
+ touchLayer.selectAll(".note").remove();
+ drawLayer.transition().duration(250).style("opacity", 0).on("end interrupt", function() {
+ editOff();
+ dispatch14.call("change");
+ });
+ }
+ function updateMarkers() {
+ if (!_notesVisible || !_notesEnabled) return;
+ var service = getService();
+ var selectedID = context.selectedNoteID();
+ var data = service ? service.notes(projection2) : [];
+ var getTransform = svgPointTransform(projection2);
+ var notes = drawLayer.selectAll(".note").data(data, function(d2) {
+ return d2.status + d2.id;
+ });
+ notes.exit().remove();
+ var notesEnter = notes.enter().append("g").attr("class", function(d2) {
+ return "note note-" + d2.id + " " + d2.status;
+ }).classed("new", function(d2) {
+ return d2.id < 0;
+ });
+ notesEnter.append("ellipse").attr("cx", 0.5).attr("cy", 1).attr("rx", 6.5).attr("ry", 3).attr("class", "stroke");
+ notesEnter.append("path").call(markerPath, "shadow");
+ notesEnter.append("use").attr("class", "note-fill").attr("width", "20px").attr("height", "20px").attr("x", "-8px").attr("y", "-22px").attr("xlink:href", "#iD-icon-note");
+ notesEnter.selectAll(".icon-annotation").data(function(d2) {
+ return [d2];
+ }).enter().append("use").attr("class", "icon-annotation").attr("width", "10px").attr("height", "10px").attr("x", "-3px").attr("y", "-19px").attr("xlink:href", function(d2) {
+ if (d2.id < 0) return "#iD-icon-plus";
+ if (d2.status === "open") return "#iD-icon-close";
+ return "#iD-icon-apply";
+ });
+ notes.merge(notesEnter).sort(sortY).classed("selected", function(d2) {
+ var mode = context.mode();
+ var isMoving = mode && mode.id === "drag-note";
+ return !isMoving && d2.id === selectedID;
+ }).attr("transform", getTransform);
+ if (touchLayer.empty()) return;
+ var fillClass = context.getDebug("target") ? "pink " : "nocolor ";
+ var targets = touchLayer.selectAll(".note").data(data, function(d2) {
+ return d2.id;
+ });
+ targets.exit().remove();
+ targets.enter().append("rect").attr("width", "20px").attr("height", "20px").attr("x", "-8px").attr("y", "-22px").merge(targets).sort(sortY).attr("class", function(d2) {
+ var newClass = d2.id < 0 ? "new" : "";
+ return "note target note-" + d2.id + " " + fillClass + newClass;
+ }).attr("transform", getTransform);
+ function sortY(a2, b2) {
+ if (a2.id === selectedID) return 1;
+ if (b2.id === selectedID) return -1;
+ return b2.loc[1] - a2.loc[1];
}
- if (position) {
- if (scrollNode && (placement === "top" || placement === "bottom")) {
- var initialPosX = position.x;
- if (position.x + popoverFrame.w > scrollNode.offsetWidth - 10) {
- position.x = scrollNode.offsetWidth - 10 - popoverFrame.w;
- } else if (position.x < 10) {
- position.x = 10;
- }
- var arrow = anchor.selectAll(".popover-" + _id + " > .popover-arrow");
- var arrowPosX = Math.min(Math.max(popoverFrame.w / 2 - (position.x - initialPosX), 10), popoverFrame.w - 10);
- arrow.style("left", ~~arrowPosX + "px");
- }
- popoverSelection.style("left", ~~position.x + "px").style("top", ~~position.y + "px");
- } else {
- popoverSelection.style("left", null).style("top", null);
+ }
+ function drawNotes(selection2) {
+ var service = getService();
+ var surface = context.surface();
+ if (surface && !surface.empty()) {
+ touchLayer = surface.selectAll(".data-layer.touch .layer-touch.markers");
}
- function getFrame(node) {
- var positionStyle = select_default2(node).style("position");
- if (positionStyle === "absolute" || positionStyle === "static") {
- return {
- x: node.offsetLeft - scrollLeft,
- y: node.offsetTop - scrollTop,
- w: node.offsetWidth,
- h: node.offsetHeight
- };
+ drawLayer = selection2.selectAll(".layer-notes").data(service ? [0] : []);
+ drawLayer.exit().remove();
+ drawLayer = drawLayer.enter().append("g").attr("class", "layer-notes").style("display", _notesEnabled ? "block" : "none").merge(drawLayer);
+ if (_notesEnabled) {
+ if (service && ~~context.map().zoom() >= minZoom5) {
+ editOn();
+ service.loadNotes(projection2);
+ updateMarkers();
} else {
- return {
- x: 0,
- y: 0,
- w: node.offsetWidth,
- h: node.offsetHeight
- };
+ editOff();
}
}
}
- function hide() {
- var anchor = select_default2(this);
- if (_displayType.apply(this, arguments) === "clickFocus") {
- anchor.classed("active", false);
- }
- anchor.selectAll(".popover-" + _id).classed("in", false);
- }
- function toggle() {
- if (select_default2(this).select(".popover-" + _id).classed("in")) {
- hide.apply(this, arguments);
+ drawNotes.enabled = function(val) {
+ if (!arguments.length) return _notesEnabled;
+ _notesEnabled = val;
+ if (_notesEnabled) {
+ layerOn();
} else {
- show.apply(this, arguments);
+ layerOff();
+ if (context.selectedNoteID()) {
+ context.enter(modeBrowse(context));
+ }
}
+ dispatch14.call("change");
+ return this;
+ };
+ return drawNotes;
+ }
+
+ // modules/svg/touch.js
+ function svgTouch() {
+ function drawTouch(selection2) {
+ selection2.selectAll(".layer-touch").data(["areas", "lines", "points", "turns", "markers"]).enter().append("g").attr("class", function(d2) {
+ return "layer-touch " + d2;
+ });
}
- return popover;
+ return drawTouch;
}
- // modules/ui/tooltip.js
- function uiTooltip(klass) {
- var tooltip = uiPopover((klass || "") + " tooltip").displayType("hover");
- var _title = function() {
- var title = this.getAttribute("data-original-title");
- if (title) {
- return title;
- } else {
- title = this.getAttribute("title");
- this.removeAttribute("title");
- this.setAttribute("data-original-title", title);
- }
- return title;
- };
- var _heading = utilFunctor(null);
- var _keys = utilFunctor(null);
- tooltip.title = function(val) {
- if (!arguments.length)
- return _title;
- _title = utilFunctor(val);
- return tooltip;
+ // modules/util/dimensions.js
+ function refresh(selection2, node) {
+ var cr = node.getBoundingClientRect();
+ var prop = [cr.width, cr.height];
+ selection2.property("__dimensions__", prop);
+ return prop;
+ }
+ function utilGetDimensions(selection2, force) {
+ if (!selection2 || selection2.empty()) {
+ return [0, 0];
+ }
+ var node = selection2.node(), cached = selection2.property("__dimensions__");
+ return !cached || force ? refresh(selection2, node) : cached;
+ }
+ function utilSetDimensions(selection2, dimensions) {
+ if (!selection2 || selection2.empty()) {
+ return selection2;
+ }
+ var node = selection2.node();
+ if (dimensions === null) {
+ refresh(selection2, node);
+ return selection2;
+ }
+ return selection2.property("__dimensions__", [dimensions[0], dimensions[1]]).attr("width", dimensions[0]).attr("height", dimensions[1]);
+ }
+
+ // modules/svg/layers.js
+ function svgLayers(projection2, context) {
+ var dispatch14 = dispatch_default("change");
+ var svg2 = select_default2(null);
+ var _layers = [
+ { id: "osm", layer: svgOsm(projection2, context, dispatch14) },
+ { id: "notes", layer: svgNotes(projection2, context, dispatch14) },
+ { id: "data", layer: svgData(projection2, context, dispatch14) },
+ { id: "keepRight", layer: svgKeepRight(projection2, context, dispatch14) },
+ { id: "osmose", layer: svgOsmose(projection2, context, dispatch14) },
+ { id: "streetside", layer: svgStreetside(projection2, context, dispatch14) },
+ { id: "mapillary", layer: svgMapillaryImages(projection2, context, dispatch14) },
+ { id: "mapillary-position", layer: svgMapillaryPosition(projection2, context, dispatch14) },
+ { id: "mapillary-map-features", layer: svgMapillaryMapFeatures(projection2, context, dispatch14) },
+ { id: "mapillary-signs", layer: svgMapillarySigns(projection2, context, dispatch14) },
+ { id: "kartaview", layer: svgKartaviewImages(projection2, context, dispatch14) },
+ { id: "mapilio", layer: svgMapilioImages(projection2, context, dispatch14) },
+ { id: "vegbilder", layer: svgVegbilder(projection2, context, dispatch14) },
+ { id: "panoramax", layer: svgPanoramaxImages(projection2, context, dispatch14) },
+ { id: "local-photos", layer: svgLocalPhotos(projection2, context, dispatch14) },
+ { id: "debug", layer: svgDebug(projection2, context, dispatch14) },
+ { id: "geolocate", layer: svgGeolocate(projection2, context, dispatch14) },
+ { id: "touch", layer: svgTouch(projection2, context, dispatch14) }
+ ];
+ function drawLayers(selection2) {
+ svg2 = selection2.selectAll(".surface").data([0]);
+ svg2 = svg2.enter().append("svg").attr("class", "surface").merge(svg2);
+ var defs = svg2.selectAll(".surface-defs").data([0]);
+ defs.enter().append("defs").attr("class", "surface-defs");
+ var groups = svg2.selectAll(".data-layer").data(_layers);
+ groups.exit().remove();
+ groups.enter().append("g").attr("class", function(d2) {
+ return "data-layer " + d2.id;
+ }).merge(groups).each(function(d2) {
+ select_default2(this).call(d2.layer);
+ });
+ }
+ drawLayers.all = function() {
+ return _layers;
};
- tooltip.heading = function(val) {
- if (!arguments.length)
- return _heading;
- _heading = utilFunctor(val);
- return tooltip;
+ drawLayers.layer = function(id2) {
+ var obj = _layers.find(function(o2) {
+ return o2.id === id2;
+ });
+ return obj && obj.layer;
};
- tooltip.keys = function(val) {
- if (!arguments.length)
- return _keys;
- _keys = utilFunctor(val);
- return tooltip;
+ drawLayers.only = function(what) {
+ var arr = [].concat(what);
+ var all = _layers.map(function(layer) {
+ return layer.id;
+ });
+ return drawLayers.remove(utilArrayDifference(all, arr));
};
- tooltip.content(function() {
- var heading = _heading.apply(this, arguments);
- var text2 = _title.apply(this, arguments);
- var keys = _keys.apply(this, arguments);
- return function(selection2) {
- var headingSelect = selection2.selectAll(".tooltip-heading").data(heading ? [heading] : []);
- headingSelect.exit().remove();
- headingSelect.enter().append("div").attr("class", "tooltip-heading").merge(headingSelect).html(heading);
- var textSelect = selection2.selectAll(".tooltip-text").data(text2 ? [text2] : []);
- textSelect.exit().remove();
- textSelect.enter().append("div").attr("class", "tooltip-text").merge(textSelect).html(text2);
- var keyhintWrap = selection2.selectAll(".keyhint-wrap").data(keys && keys.length ? [0] : []);
- keyhintWrap.exit().remove();
- var keyhintWrapEnter = keyhintWrap.enter().append("div").attr("class", "keyhint-wrap");
- keyhintWrapEnter.append("span").call(_t.append("tooltip_keyhint"));
- keyhintWrap = keyhintWrapEnter.merge(keyhintWrap);
- keyhintWrap.selectAll("kbd.shortcut").data(keys && keys.length ? keys : []).enter().append("kbd").attr("class", "shortcut").html(function(d) {
- return d;
+ drawLayers.remove = function(what) {
+ var arr = [].concat(what);
+ arr.forEach(function(id2) {
+ _layers = _layers.filter(function(o2) {
+ return o2.id !== id2;
});
- };
- });
- return tooltip;
+ });
+ dispatch14.call("change");
+ return this;
+ };
+ drawLayers.add = function(what) {
+ var arr = [].concat(what);
+ arr.forEach(function(obj) {
+ if ("id" in obj && "layer" in obj) {
+ _layers.push(obj);
+ }
+ });
+ dispatch14.call("change");
+ return this;
+ };
+ drawLayers.dimensions = function(val) {
+ if (!arguments.length) return utilGetDimensions(svg2);
+ utilSetDimensions(svg2, val);
+ return this;
+ };
+ return utilRebind(drawLayers, dispatch14, "on");
}
- // modules/ui/edit_menu.js
- function uiEditMenu(context) {
- var dispatch10 = dispatch_default("toggled");
- var _menu = select_default2(null);
- var _operations = [];
- var _anchorLoc = [0, 0];
- var _anchorLocLonLat = [0, 0];
- var _triggerType = "";
- var _vpTopMargin = 85;
- var _vpBottomMargin = 45;
- var _vpSideMargin = 35;
- var _menuTop = false;
- var _menuHeight;
- var _menuWidth;
- var _verticalPadding = 4;
- var _tooltipWidth = 210;
- var _menuSideMargin = 10;
- var _tooltips = [];
- var editMenu = function(selection2) {
- var isTouchMenu = _triggerType.includes("touch") || _triggerType.includes("pen");
- var ops = _operations.filter(function(op) {
- return !isTouchMenu || !op.mouseOnly;
- });
- if (!ops.length)
- return;
- _tooltips = [];
- _menuTop = isTouchMenu;
- var showLabels = isTouchMenu;
- var buttonHeight = showLabels ? 32 : 34;
- if (showLabels) {
- _menuWidth = 52 + Math.min(120, 6 * Math.max.apply(Math, ops.map(function(op) {
- return op.title.length;
- })));
- } else {
- _menuWidth = 44;
- }
- _menuHeight = _verticalPadding * 2 + ops.length * buttonHeight;
- _menu = selection2.append("div").attr("class", "edit-menu").classed("touch-menu", isTouchMenu).style("padding", _verticalPadding + "px 0");
- var buttons = _menu.selectAll(".edit-menu-item").data(ops);
- var buttonsEnter = buttons.enter().append("button").attr("class", function(d) {
- return "edit-menu-item edit-menu-item-" + d.id;
- }).style("height", buttonHeight + "px").on("click", click).on("pointerup", pointerup).on("pointerdown mousedown", function pointerdown(d3_event) {
- d3_event.stopPropagation();
- }).on("mouseenter.highlight", function(d3_event, d) {
- if (!d.relatedEntityIds || select_default2(this).classed("disabled"))
- return;
- utilHighlightEntities(d.relatedEntityIds(), true, context);
- }).on("mouseleave.highlight", function(d3_event, d) {
- if (!d.relatedEntityIds)
- return;
- utilHighlightEntities(d.relatedEntityIds(), false, context);
+ // modules/svg/lines.js
+ var import_fast_deep_equal6 = __toESM(require_fast_deep_equal());
+ function onewayArrowColour(tags) {
+ if (tags.highway === "construction" && tags.bridge) return "white";
+ if (tags.highway === "pedestrian" && tags.bridge) return "pink";
+ if (tags.railway) return "black";
+ if (tags.aeroway === "runway") return "pink";
+ return "black";
+ }
+ function svgLines(projection2, context) {
+ var detected = utilDetect();
+ var highway_stack = {
+ motorway: 0,
+ motorway_link: 1,
+ trunk: 2,
+ trunk_link: 3,
+ primary: 4,
+ primary_link: 5,
+ secondary: 6,
+ tertiary: 7,
+ unclassified: 8,
+ residential: 9,
+ service: 10,
+ busway: 11,
+ footway: 12
+ };
+ function drawTargets(selection2, graph, entities, filter2) {
+ var targetClass = context.getDebug("target") ? "pink " : "nocolor ";
+ var nopeClass = context.getDebug("target") ? "red " : "nocolor ";
+ var getPath = svgPath(projection2).geojson;
+ var activeID = context.activeID();
+ var base = context.history().base();
+ var data = { targets: [], nopes: [] };
+ entities.forEach(function(way) {
+ var features = svgSegmentWay(way, graph, activeID);
+ data.targets.push.apply(data.targets, features.passive);
+ data.nopes.push.apply(data.nopes, features.active);
});
- buttonsEnter.each(function(d) {
- var tooltip = uiTooltip().heading(d.title).title(d.tooltip()).keys([d.keys[0]]);
- _tooltips.push(tooltip);
- select_default2(this).call(tooltip).append("div").attr("class", "icon-wrap").call(svgIcon(d.icon && d.icon() || "#iD-operation-" + d.id, "operation"));
+ var targetData = data.targets.filter(getPath);
+ var targets = selection2.selectAll(".line.target-allowed").filter(function(d2) {
+ return filter2(d2.properties.entity);
+ }).data(targetData, function key(d2) {
+ return d2.id;
});
- if (showLabels) {
- buttonsEnter.append("span").attr("class", "label").html(function(d) {
- return d.title;
+ targets.exit().remove();
+ var segmentWasEdited = function(d2) {
+ var wayID = d2.properties.entity.id;
+ if (!base.entities[wayID] || !(0, import_fast_deep_equal6.default)(graph.entities[wayID].nodes, base.entities[wayID].nodes)) {
+ return false;
+ }
+ return d2.properties.nodes.some(function(n3) {
+ return !base.entities[n3.id] || !(0, import_fast_deep_equal6.default)(graph.entities[n3.id].loc, base.entities[n3.id].loc);
});
- }
- buttonsEnter.merge(buttons).classed("disabled", function(d) {
- return d.disabled();
+ };
+ targets.enter().append("path").merge(targets).attr("d", getPath).attr("class", function(d2) {
+ return "way line target target-allowed " + targetClass + d2.id;
+ }).classed("segment-edited", segmentWasEdited);
+ var nopeData = data.nopes.filter(getPath);
+ var nopes = selection2.selectAll(".line.target-nope").filter(function(d2) {
+ return filter2(d2.properties.entity);
+ }).data(nopeData, function key(d2) {
+ return d2.id;
});
- updatePosition();
- var initialScale = context.projection.scale();
- context.map().on("move.edit-menu", function() {
- if (initialScale !== context.projection.scale()) {
- editMenu.close();
+ nopes.exit().remove();
+ nopes.enter().append("path").merge(nopes).attr("d", getPath).attr("class", function(d2) {
+ return "way line target target-nope " + nopeClass + d2.id;
+ }).classed("segment-edited", segmentWasEdited);
+ }
+ function drawLines(selection2, graph, entities, filter2) {
+ var base = context.history().base();
+ function waystack(a2, b2) {
+ var selected = context.selectedIDs();
+ var scoreA = selected.indexOf(a2.id) !== -1 ? 20 : 0;
+ var scoreB = selected.indexOf(b2.id) !== -1 ? 20 : 0;
+ if (a2.tags.highway) {
+ scoreA -= highway_stack[a2.tags.highway];
}
- }).on("drawn.edit-menu", function(info) {
- if (info.full)
- updatePosition();
- });
- var lastPointerUpType;
- function pointerup(d3_event) {
- lastPointerUpType = d3_event.pointerType;
- }
- function click(d3_event, operation) {
- d3_event.stopPropagation();
- if (operation.relatedEntityIds) {
- utilHighlightEntities(operation.relatedEntityIds(), false, context);
+ if (b2.tags.highway) {
+ scoreB -= highway_stack[b2.tags.highway];
}
- if (operation.disabled()) {
- if (lastPointerUpType === "touch" || lastPointerUpType === "pen") {
- context.ui().flash.duration(4e3).iconName("#iD-operation-" + operation.id).iconClass("operation disabled").label(operation.tooltip)();
+ return scoreA - scoreB;
+ }
+ function drawLineGroup(selection3, klass, isSelected) {
+ var mode = context.mode();
+ var isDrawing = mode && /^draw/.test(mode.id);
+ var selectedClass = !isDrawing && isSelected ? "selected " : "";
+ var lines = selection3.selectAll("path").filter(filter2).data(getPathData(isSelected), osmEntity.key);
+ lines.exit().remove();
+ lines.enter().append("path").attr("class", function(d2) {
+ var prefix = "way line";
+ if (!d2.hasInterestingTags()) {
+ var parentRelations = graph.parentRelations(d2);
+ var parentMultipolygons = parentRelations.filter(function(relation) {
+ return relation.isMultipolygon();
+ });
+ if (parentMultipolygons.length > 0 && // and only multipolygon relations
+ parentRelations.length === parentMultipolygons.length) {
+ prefix = "relation area";
+ }
}
- } else {
- if (lastPointerUpType === "touch" || lastPointerUpType === "pen") {
- context.ui().flash.duration(2e3).iconName("#iD-operation-" + operation.id).iconClass("operation").label(operation.annotation() || operation.title)();
+ var oldMPClass = oldMultiPolygonOuters[d2.id] ? "old-multipolygon " : "";
+ return prefix + " " + klass + " " + selectedClass + oldMPClass + d2.id;
+ }).classed("added", function(d2) {
+ return !base.entities[d2.id];
+ }).classed("geometry-edited", function(d2) {
+ return graph.entities[d2.id] && base.entities[d2.id] && !(0, import_fast_deep_equal6.default)(graph.entities[d2.id].nodes, base.entities[d2.id].nodes);
+ }).classed("retagged", function(d2) {
+ return graph.entities[d2.id] && base.entities[d2.id] && !(0, import_fast_deep_equal6.default)(graph.entities[d2.id].tags, base.entities[d2.id].tags);
+ }).call(svgTagClasses()).merge(lines).sort(waystack).attr("d", getPath).call(svgTagClasses().tags(svgRelationMemberTags(graph)));
+ return selection3;
+ }
+ function getPathData(isSelected) {
+ return function() {
+ var layer = this.parentNode.__data__;
+ var data = pathdata[layer] || [];
+ return data.filter(function(d2) {
+ if (isSelected) {
+ return context.selectedIDs().indexOf(d2.id) !== -1;
+ } else {
+ return context.selectedIDs().indexOf(d2.id) === -1;
+ }
+ });
+ };
+ }
+ function addMarkers(layergroup, pathclass, groupclass, groupdata, marker) {
+ var markergroup = layergroup.selectAll("g." + groupclass).data([pathclass]);
+ markergroup = markergroup.enter().append("g").attr("class", groupclass).merge(markergroup);
+ var markers = markergroup.selectAll("path").filter(filter2).data(
+ function data() {
+ return groupdata[this.parentNode.__data__] || [];
+ },
+ function key(d2) {
+ return [d2.id, d2.index];
}
- operation();
- editMenu.close();
+ );
+ markers.exit().remove();
+ markers = markers.enter().append("path").attr("class", pathclass).merge(markers).attr("marker-mid", marker).attr("d", function(d2) {
+ return d2.d;
+ });
+ if (detected.ie) {
+ markers.each(function() {
+ this.parentNode.insertBefore(this, this);
+ });
}
- lastPointerUpType = null;
}
- dispatch10.call("toggled", this, true);
- };
- 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();
+ var getPath = svgPath(projection2, graph);
+ var ways = [];
+ var onewaydata = {};
+ var sideddata = {};
+ var oldMultiPolygonOuters = {};
+ for (var i3 = 0; i3 < entities.length; i3++) {
+ var entity = entities[i3];
+ if (entity.geometry(graph) === "line" || entity.geometry(graph) === "area" && entity.sidednessIdentifier && entity.sidednessIdentifier() === "coastline") {
+ ways.push(entity);
+ }
+ }
+ ways = ways.filter(getPath);
+ const pathdata = utilArrayGroupBy(ways, (way) => Math.trunc(way.layer()));
+ Object.keys(pathdata).forEach(function(k2) {
+ var v2 = pathdata[k2];
+ var onewayArr = v2.filter(function(d2) {
+ return d2.isOneWay();
+ });
+ var onewaySegments = svgMarkerSegments(
+ projection2,
+ graph,
+ 35,
+ function shouldReverse(entity2) {
+ return entity2.tags.oneway === "-1" || entity2.tags.conveying === "backward";
+ },
+ function bothDirections(entity2) {
+ return entity2.tags.oneway === "alternating" || entity2.tags.oneway === "reversible" || entity2.tags.conveying === "reversible";
+ }
+ );
+ onewaydata[k2] = utilArrayFlatten(onewayArr.map(onewaySegments));
+ var sidedArr = v2.filter(function(d2) {
+ return d2.isSided();
+ });
+ var sidedSegments = svgMarkerSegments(
+ projection2,
+ graph,
+ 30,
+ function shouldReverse() {
+ return false;
+ },
+ function bothDirections() {
+ return false;
+ }
+ );
+ sideddata[k2] = utilArrayFlatten(sidedArr.map(sidedSegments));
+ });
+ var covered = selection2.selectAll(".layer-osm.covered");
+ var uncovered = selection2.selectAll(".layer-osm.lines");
+ var touchLayer = selection2.selectAll(".layer-touch.lines");
+ [covered, uncovered].forEach(function(selection3) {
+ var range3 = selection3 === covered ? range(-10, 0) : range(0, 11);
+ var layergroup = selection3.selectAll("g.layergroup").data(range3);
+ layergroup = layergroup.enter().append("g").attr("class", function(d2) {
+ return "layergroup layer" + String(d2);
+ }).merge(layergroup);
+ layergroup.selectAll("g.linegroup").data(["shadow", "casing", "stroke", "shadow-highlighted", "casing-highlighted", "stroke-highlighted"]).enter().append("g").attr("class", function(d2) {
+ return "linegroup line-" + d2;
+ });
+ layergroup.selectAll("g.line-shadow").call(drawLineGroup, "shadow", false);
+ layergroup.selectAll("g.line-casing").call(drawLineGroup, "casing", false);
+ layergroup.selectAll("g.line-stroke").call(drawLineGroup, "stroke", false);
+ layergroup.selectAll("g.line-shadow-highlighted").call(drawLineGroup, "shadow", true);
+ layergroup.selectAll("g.line-casing-highlighted").call(drawLineGroup, "casing", true);
+ layergroup.selectAll("g.line-stroke-highlighted").call(drawLineGroup, "stroke", true);
+ addMarkers(layergroup, "oneway", "onewaygroup", onewaydata, (d2) => {
+ const category = onewayArrowColour(graph.entity(d2.id).tags);
+ return "url(#ideditor-oneway-marker-".concat(category, ")");
+ });
+ addMarkers(
+ layergroup,
+ "sided",
+ "sidedgroup",
+ sideddata,
+ function marker(d2) {
+ var category = graph.entity(d2.id).sidednessIdentifier();
+ return "url(#ideditor-sided-marker-" + category + ")";
+ }
+ );
+ });
+ touchLayer.call(drawTargets, graph, ways, filter2);
+ }
+ return drawLines;
+ }
+
+ // modules/svg/midpoints.js
+ function svgMidpoints(projection2, context) {
+ var targetRadius = 8;
+ function drawTargets(selection2, graph, entities, filter2) {
+ var fillClass = context.getDebug("target") ? "pink " : "nocolor ";
+ var getTransform = svgPointTransform(projection2).geojson;
+ var data = entities.map(function(midpoint) {
+ return {
+ type: "Feature",
+ id: midpoint.id,
+ properties: {
+ target: true,
+ entity: midpoint
+ },
+ geometry: {
+ type: "Point",
+ coordinates: midpoint.loc
+ }
+ };
+ });
+ var targets = selection2.selectAll(".midpoint.target").filter(function(d2) {
+ return filter2(d2.properties.entity);
+ }).data(data, function key(d2) {
+ return d2.id;
+ });
+ targets.exit().remove();
+ targets.enter().append("circle").attr("r", targetRadius).merge(targets).attr("class", function(d2) {
+ return "node midpoint target " + fillClass + d2.id;
+ }).attr("transform", getTransform);
+ }
+ function drawMidpoints(selection2, graph, entities, filter2, extent) {
+ var drawLayer = selection2.selectAll(".layer-osm.points .points-group.midpoints");
+ var touchLayer = selection2.selectAll(".layer-touch.points");
+ var mode = context.mode();
+ if (mode && mode.id !== "select" || !context.map().withinEditableZoom()) {
+ drawLayer.selectAll(".midpoint").remove();
+ touchLayer.selectAll(".midpoint.target").remove();
return;
}
- 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;
+ var poly = extent.polygon();
+ var midpoints = {};
+ for (var i3 = 0; i3 < entities.length; i3++) {
+ var entity = entities[i3];
+ if (entity.type !== "way") continue;
+ if (!filter2(entity)) continue;
+ if (context.selectedIDs().indexOf(entity.id) < 0) continue;
+ var nodes = graph.childNodes(entity);
+ for (var j2 = 0; j2 < nodes.length - 1; j2++) {
+ var a2 = nodes[j2];
+ var b2 = nodes[j2 + 1];
+ var id2 = [a2.id, b2.id].sort().join("-");
+ if (midpoints[id2]) {
+ midpoints[id2].parents.push(entity);
+ } else if (geoVecLength(projection2(a2.loc), projection2(b2.loc)) > 40) {
+ var point = geoVecInterp(a2.loc, b2.loc, 0.5);
+ var loc = null;
+ if (extent.intersects(point)) {
+ loc = point;
+ } else {
+ for (var k2 = 0; k2 < 4; k2++) {
+ point = geoLineIntersection([a2.loc, b2.loc], [poly[k2], poly[k2 + 1]]);
+ if (point && geoVecLength(projection2(a2.loc), projection2(point)) > 20 && geoVecLength(projection2(b2.loc), projection2(point)) > 20) {
+ loc = point;
+ break;
+ }
+ }
+ }
+ if (loc) {
+ midpoints[id2] = {
+ type: "midpoint",
+ id: id2,
+ loc,
+ edge: [a2.id, b2.id],
+ parents: [entity]
+ };
+ }
}
- 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";
+ function midpointFilter(d2) {
+ if (midpoints[d2.id]) return true;
+ for (var i4 = 0; i4 < d2.parents.length; i4++) {
+ if (filter2(d2.parents[i4])) {
+ return true;
}
- return "left";
}
+ return false;
}
+ var groups = drawLayer.selectAll(".midpoint").filter(midpointFilter).data(Object.values(midpoints), function(d2) {
+ return d2.id;
+ });
+ groups.exit().remove();
+ var enter = groups.enter().insert("g", ":first-child").attr("class", "midpoint");
+ enter.append("polygon").attr("points", "-6,8 10,0 -6,-8").attr("class", "shadow");
+ enter.append("polygon").attr("points", "-3,4 5,0 -3,-4").attr("class", "fill");
+ groups = groups.merge(enter).attr("transform", function(d2) {
+ var translate = svgPointTransform(projection2);
+ var a3 = graph.entity(d2.edge[0]);
+ var b3 = graph.entity(d2.edge[1]);
+ var angle2 = geoAngle(a3, b3, projection2) * (180 / Math.PI);
+ return translate(d2) + " rotate(" + angle2 + ")";
+ }).call(svgTagClasses().tags(
+ function(d2) {
+ return d2.parents[0].tags;
+ }
+ ));
+ groups.select("polygon.shadow");
+ groups.select("polygon.fill");
+ touchLayer.call(drawTargets, graph, Object.values(midpoints), midpointFilter);
}
- editMenu.close = function() {
- context.map().on("move.edit-menu", null).on("drawn.edit-menu", null);
- _menu.remove();
- _tooltips = [];
- dispatch10.call("toggled", this, false);
- };
- 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, dispatch10, "on");
+ return drawMidpoints;
}
- // modules/ui/feature_info.js
- function uiFeatureInfo(context) {
- function update(selection2) {
- var features2 = context.features();
- var stats = features2.stats();
- var count = 0;
- var hiddenList = features2.hidden().map(function(k) {
- if (stats[k]) {
- count += stats[k];
- return _t.html("inspector.title_count", { title: { html: _t.html("feature." + k + ".description") }, count: stats[k] });
- }
- return null;
- }).filter(Boolean);
- selection2.html("");
- if (hiddenList.length) {
- var tooltipBehavior = uiTooltip().placement("top").title(function() {
- return hiddenList.join("
");
- });
- 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"));
+ // modules/svg/points.js
+ var import_fast_deep_equal7 = __toESM(require_fast_deep_equal());
+ function svgPoints(projection2, context) {
+ function markerPath(selection2, klass) {
+ selection2.attr("class", klass).attr("transform", "translate(-8, -23)").attr("d", "M 17,8 C 17,13 11,21 8.5,23.5 C 6,21 0,13 0,8 C 0,4 4,-0.5 8.5,-0.5 C 13,-0.5 17,4 17,8 z");
+ }
+ function sortY(a2, b2) {
+ return b2.loc[1] - a2.loc[1];
+ }
+ function fastEntityKey(d2) {
+ var mode = context.mode();
+ var isMoving = mode && /^(add|draw|drag|move|rotate)/.test(mode.id);
+ return isMoving ? d2.id : osmEntity.key(d2);
+ }
+ function drawTargets(selection2, graph, entities, filter2) {
+ var fillClass = context.getDebug("target") ? "pink " : "nocolor ";
+ var getTransform = svgPointTransform(projection2).geojson;
+ var activeID = context.activeID();
+ var data = [];
+ entities.forEach(function(node) {
+ if (activeID === node.id) return;
+ data.push({
+ type: "Feature",
+ id: node.id,
+ properties: {
+ target: true,
+ entity: node
+ },
+ geometry: node.asGeoJSON()
});
- }
- selection2.classed("hide", !hiddenList.length);
+ });
+ var targets = selection2.selectAll(".point.target").filter(function(d2) {
+ return filter2(d2.properties.entity);
+ }).data(data, function key(d2) {
+ return d2.id;
+ });
+ targets.exit().remove();
+ targets.enter().append("rect").attr("x", -10).attr("y", -26).attr("width", 20).attr("height", 30).merge(targets).attr("class", function(d2) {
+ return "node point target " + fillClass + d2.id;
+ }).attr("transform", getTransform);
}
- return function(selection2) {
- update(selection2);
- context.features().on("change.feature_info", function() {
- update(selection2);
+ function drawPoints(selection2, graph, entities, filter2) {
+ var wireframe = context.surface().classed("fill-wireframe");
+ var zoom = geoScaleToZoom(projection2.scale());
+ var base = context.history().base();
+ function renderAsPoint(entity) {
+ return entity.geometry(graph) === "point" && !(zoom >= 18 && entity.directions(graph, projection2).length);
+ }
+ var points = wireframe ? [] : entities.filter(renderAsPoint);
+ points.sort(sortY);
+ var drawLayer = selection2.selectAll(".layer-osm.points .points-group.points");
+ var touchLayer = selection2.selectAll(".layer-touch.points");
+ var groups = drawLayer.selectAll("g.point").filter(filter2).data(points, fastEntityKey);
+ groups.exit().remove();
+ var enter = groups.enter().append("g").attr("class", function(d2) {
+ return "node point " + d2.id;
+ }).order();
+ enter.append("path").call(markerPath, "shadow");
+ enter.append("ellipse").attr("cx", 0.5).attr("cy", 1).attr("rx", 6.5).attr("ry", 3).attr("class", "stroke");
+ enter.append("path").call(markerPath, "stroke");
+ enter.append("use").attr("transform", "translate(-5.5, -20)").attr("class", "icon").attr("width", "12px").attr("height", "12px");
+ groups = groups.merge(enter).attr("transform", svgPointTransform(projection2)).classed("added", function(d2) {
+ return !base.entities[d2.id];
+ }).classed("moved", function(d2) {
+ return base.entities[d2.id] && !(0, import_fast_deep_equal7.default)(graph.entities[d2.id].loc, base.entities[d2.id].loc);
+ }).classed("retagged", function(d2) {
+ return base.entities[d2.id] && !(0, import_fast_deep_equal7.default)(graph.entities[d2.id].tags, base.entities[d2.id].tags);
+ }).call(svgTagClasses());
+ groups.select(".shadow");
+ groups.select(".stroke");
+ groups.select(".icon").attr("xlink:href", function(entity) {
+ var preset = _mainPresetIndex.match(entity, graph);
+ var picon = preset && preset.icon;
+ return picon ? "#" + picon : "";
});
- };
+ touchLayer.call(drawTargets, graph, points, filter2);
+ }
+ return drawPoints;
}
- // modules/ui/flash.js
- function uiFlash(context) {
- var _flashTimer;
- var _duration = 2e3;
- var _iconName = "#iD-icon-no";
- var _iconClass = "disabled";
- var _label = "";
- function flash() {
- if (_flashTimer) {
- _flashTimer.stop();
+ // modules/svg/turns.js
+ function svgTurns(projection2, context) {
+ function icon2(turn) {
+ var u2 = turn.u ? "-u" : "";
+ if (turn.no) return "#iD-turn-no" + u2;
+ if (turn.only) return "#iD-turn-only" + u2;
+ return "#iD-turn-yes" + u2;
+ }
+ function drawTurns(selection2, graph, turns) {
+ function turnTransform(d2) {
+ var pxRadius = 50;
+ var toWay = graph.entity(d2.to.way);
+ var toPoints = graph.childNodes(toWay).map(function(n3) {
+ return n3.loc;
+ }).map(projection2);
+ var toLength = geoPathLength(toPoints);
+ var mid = toLength / 2;
+ var toNode = graph.entity(d2.to.node);
+ var toVertex = graph.entity(d2.to.vertex);
+ var a2 = geoAngle(toVertex, toNode, projection2);
+ var o2 = projection2(toVertex.loc);
+ var r2 = d2.u ? 0 : !toWay.__via ? pxRadius : Math.min(mid, pxRadius);
+ return "translate(" + (r2 * Math.cos(a2) + o2[0]) + "," + (r2 * Math.sin(a2) + o2[1]) + ") rotate(" + a2 * 180 / Math.PI + ")";
}
- 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").html(_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;
+ var drawLayer = selection2.selectAll(".layer-osm.points .points-group.turns");
+ var touchLayer = selection2.selectAll(".layer-touch.turns");
+ var groups = drawLayer.selectAll("g.turn").data(turns, function(d2) {
+ return d2.key;
+ });
+ groups.exit().remove();
+ var groupsEnter = groups.enter().append("g").attr("class", function(d2) {
+ return "turn " + d2.key;
+ });
+ var turnsEnter = groupsEnter.filter(function(d2) {
+ return !d2.u;
+ });
+ turnsEnter.append("rect").attr("transform", "translate(-22, -12)").attr("width", "44").attr("height", "24");
+ turnsEnter.append("use").attr("transform", "translate(-22, -12)").attr("width", "44").attr("height", "24");
+ var uEnter = groupsEnter.filter(function(d2) {
+ return d2.u;
+ });
+ uEnter.append("circle").attr("r", "16");
+ uEnter.append("use").attr("transform", "translate(-16, -16)").attr("width", "32").attr("height", "32");
+ groups = groups.merge(groupsEnter).attr("opacity", function(d2) {
+ return d2.direct === false ? "0.7" : null;
+ }).attr("transform", turnTransform);
+ groups.select("use").attr("xlink:href", icon2);
+ groups.select("rect");
+ groups.select("circle");
+ var fillClass = context.getDebug("target") ? "pink " : "nocolor ";
+ groups = touchLayer.selectAll("g.turn").data(turns, function(d2) {
+ return d2.key;
+ });
+ groups.exit().remove();
+ groupsEnter = groups.enter().append("g").attr("class", function(d2) {
+ return "turn " + d2.key;
+ });
+ turnsEnter = groupsEnter.filter(function(d2) {
+ return !d2.u;
+ });
+ turnsEnter.append("rect").attr("class", "target " + fillClass).attr("transform", "translate(-22, -12)").attr("width", "44").attr("height", "24");
+ uEnter = groupsEnter.filter(function(d2) {
+ return d2.u;
+ });
+ uEnter.append("circle").attr("class", "target " + fillClass).attr("r", "16");
+ groups = groups.merge(groupsEnter).attr("transform", turnTransform);
+ groups.select("rect");
+ groups.select("circle");
+ return this;
}
- flash.duration = function(_) {
- if (!arguments.length)
- return _duration;
- _duration = _;
- return flash;
- };
- flash.label = function(_) {
- if (!arguments.length)
- return _label;
- _label = _;
- return flash;
- };
- flash.iconName = function(_) {
- if (!arguments.length)
- return _iconName;
- _iconName = _;
- return flash;
- };
- flash.iconClass = function(_) {
- if (!arguments.length)
- return _iconClass;
- _iconClass = _;
- return flash;
- };
- return flash;
+ return drawTurns;
}
- // 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;
- }
+ // modules/svg/vertices.js
+ var import_fast_deep_equal8 = __toESM(require_fast_deep_equal());
+ function svgVertices(projection2, context) {
+ var radiuses = {
+ // z16-, z17, z18+, w/icon
+ shadow: [6, 7.5, 7.5, 12],
+ stroke: [2.5, 3.5, 3.5, 8],
+ fill: [1, 1.5, 1.5, 1.5]
+ };
+ var _currHoverTarget;
+ var _currPersistent = {};
+ var _currHover = {};
+ var _prevHover = {};
+ var _currSelected = {};
+ var _prevSelected = {};
+ var _radii = {};
+ function sortY(a2, b2) {
+ return b2.loc[1] - a2.loc[1];
}
- 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 fastEntityKey(d2) {
+ var mode = context.mode();
+ var isMoving = mode && /^(add|draw|drag|move|rotate)/.test(mode.id);
+ return isMoving ? d2.id : osmEntity.key(d2);
+ }
+ function draw(selection2, graph, vertices, sets2, filter2) {
+ sets2 = sets2 || { selected: {}, important: {}, hovered: {} };
+ var icons = {};
+ var directions = {};
+ var wireframe = context.surface().classed("fill-wireframe");
+ var zoom = geoScaleToZoom(projection2.scale());
+ var z2 = zoom < 17 ? 0 : zoom < 18 ? 1 : 2;
+ var activeID = context.activeID();
+ var base = context.history().base();
+ function getIcon(d2) {
+ var entity = graph.entity(d2.id);
+ if (entity.id in icons) return icons[entity.id];
+ icons[entity.id] = entity.hasInterestingTags() && _mainPresetIndex.match(entity, graph).icon;
+ return icons[entity.id];
+ }
+ function getDirections(entity) {
+ if (entity.id in directions) return directions[entity.id];
+ var angles = entity.directions(graph, projection2);
+ directions[entity.id] = angles.length ? angles : false;
+ return angles;
}
+ function updateAttributes(selection3) {
+ ["shadow", "stroke", "fill"].forEach(function(klass) {
+ var rads = radiuses[klass];
+ selection3.selectAll("." + klass).each(function(entity) {
+ var i3 = z2 && getIcon(entity);
+ var r2 = rads[i3 ? 3 : z2];
+ if (entity.id !== activeID && entity.isEndpoint(graph) && !entity.isConnected(graph)) {
+ r2 += 1.5;
+ }
+ if (klass === "shadow") {
+ _radii[entity.id] = r2;
+ }
+ select_default2(this).attr("r", r2).attr("visibility", i3 && klass === "fill" ? "hidden" : null);
+ });
+ });
+ }
+ vertices.sort(sortY);
+ var groups = selection2.selectAll("g.vertex").filter(filter2).data(vertices, fastEntityKey);
+ groups.exit().remove();
+ var enter = groups.enter().append("g").attr("class", function(d2) {
+ return "node vertex " + d2.id;
+ }).order();
+ enter.append("circle").attr("class", "shadow");
+ enter.append("circle").attr("class", "stroke");
+ enter.filter(function(d2) {
+ return d2.hasInterestingTags();
+ }).append("circle").attr("class", "fill");
+ groups = groups.merge(enter).attr("transform", svgPointTransform(projection2)).classed("sibling", function(d2) {
+ return d2.id in sets2.selected;
+ }).classed("shared", function(d2) {
+ return graph.isShared(d2);
+ }).classed("endpoint", function(d2) {
+ return d2.isEndpoint(graph);
+ }).classed("added", function(d2) {
+ return !base.entities[d2.id];
+ }).classed("moved", function(d2) {
+ return base.entities[d2.id] && !(0, import_fast_deep_equal8.default)(graph.entities[d2.id].loc, base.entities[d2.id].loc);
+ }).classed("retagged", function(d2) {
+ return base.entities[d2.id] && !(0, import_fast_deep_equal8.default)(graph.entities[d2.id].tags, base.entities[d2.id].tags);
+ }).call(svgTagClasses()).call(updateAttributes);
+ var iconUse = groups.selectAll(".icon").data(function data(d2) {
+ return zoom >= 17 && getIcon(d2) ? [d2] : [];
+ }, fastEntityKey);
+ iconUse.exit().remove();
+ iconUse.enter().append("use").attr("class", "icon").attr("width", "12px").attr("height", "12px").attr("transform", "translate(-6, -6)").attr("xlink:href", function(d2) {
+ var picon = getIcon(d2);
+ return picon ? "#" + picon : "";
+ });
+ var dgroups = groups.selectAll(".viewfieldgroup").data(function data(d2) {
+ return zoom >= 18 && getDirections(d2) ? [d2] : [];
+ }, fastEntityKey);
+ dgroups.exit().remove();
+ dgroups = dgroups.enter().insert("g", ".shadow").attr("class", "viewfieldgroup").merge(dgroups);
+ var viewfields = dgroups.selectAll(".viewfield").data(getDirections, function key(d2) {
+ return osmEntity.key(d2);
+ });
+ viewfields.exit().remove();
+ viewfields.enter().append("path").attr("class", "viewfield").attr("d", "M0,0H0").merge(viewfields).attr("marker-start", "url(#ideditor-viewfield-marker" + (wireframe ? "-wireframe" : "") + ")").attr("transform", function(d2) {
+ return "rotate(" + d2 + ")";
+ });
}
- function isFullScreen() {
- return document.fullscreenElement || document.mozFullScreenElement || document.webkitFullscreenElement || document.msFullscreenElement;
+ function drawTargets(selection2, graph, entities, filter2) {
+ var targetClass = context.getDebug("target") ? "pink " : "nocolor ";
+ var nopeClass = context.getDebug("target") ? "red " : "nocolor ";
+ var getTransform = svgPointTransform(projection2).geojson;
+ var activeID = context.activeID();
+ var data = { targets: [], nopes: [] };
+ entities.forEach(function(node) {
+ if (activeID === node.id) return;
+ var vertexType = svgPassiveVertex(node, graph, activeID);
+ if (vertexType !== 0) {
+ data.targets.push({
+ type: "Feature",
+ id: node.id,
+ properties: {
+ target: true,
+ entity: node
+ },
+ geometry: node.asGeoJSON()
+ });
+ } else {
+ data.nopes.push({
+ type: "Feature",
+ id: node.id + "-nope",
+ properties: {
+ nope: true,
+ target: true,
+ entity: node
+ },
+ geometry: node.asGeoJSON()
+ });
+ }
+ });
+ var targets = selection2.selectAll(".vertex.target-allowed").filter(function(d2) {
+ return filter2(d2.properties.entity);
+ }).data(data.targets, function key(d2) {
+ return d2.id;
+ });
+ targets.exit().remove();
+ targets.enter().append("circle").attr("r", function(d2) {
+ return _radii[d2.id] || radiuses.shadow[3];
+ }).merge(targets).attr("class", function(d2) {
+ return "node vertex target target-allowed " + targetClass + d2.id;
+ }).attr("transform", getTransform);
+ var nopes = selection2.selectAll(".vertex.target-nope").filter(function(d2) {
+ return filter2(d2.properties.entity);
+ }).data(data.nopes, function key(d2) {
+ return d2.id;
+ });
+ nopes.exit().remove();
+ nopes.enter().append("circle").attr("r", function(d2) {
+ return _radii[d2.properties.entity.id] || radiuses.shadow[3];
+ }).merge(nopes).attr("class", function(d2) {
+ return "node vertex target target-nope " + nopeClass + d2.id;
+ }).attr("transform", getTransform);
}
- function isSupported() {
- return !!getFullScreenFn();
+ function renderAsVertex(entity, graph, wireframe, zoom) {
+ var geometry = entity.geometry(graph);
+ return geometry === "vertex" || geometry === "point" && (wireframe || zoom >= 18 && entity.directions(graph, projection2).length);
}
- function fullScreen(d3_event) {
- d3_event.preventDefault();
- if (!isFullScreen()) {
- getFullScreenFn().apply(element);
- } else {
- getExitFullScreenFn().apply(document);
- }
+ function isEditedNode(node, base, head) {
+ var baseNode = base.entities[node.id];
+ var headNode = head.entities[node.id];
+ return !headNode || !baseNode || !(0, import_fast_deep_equal8.default)(headNode.tags, baseNode.tags) || !(0, import_fast_deep_equal8.default)(headNode.loc, baseNode.loc);
}
- return function() {
- if (!isSupported())
- return;
- var detected = utilDetect();
- var keys = detected.os === "mac" ? [uiCmd("\u2303\u2318F"), "f11"] : ["f11"];
- context.keybinding().on(keys, fullScreen);
- };
- }
-
- // modules/ui/geolocate.js
- function uiGeolocate(context) {
- var _geolocationOptions = {
- enableHighAccuracy: false,
- timeout: 6e3
- };
- 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);
- context.container().call(_locating);
- navigator.geolocation.getCurrentPosition(success, error, _geolocationOptions);
- } else {
- _locating.close();
- _layer.enabled(null, false);
- updateButtonState();
+ function getSiblingAndChildVertices(ids, graph, wireframe, zoom) {
+ var results = {};
+ var seenIds = {};
+ function addChildVertices(entity) {
+ if (seenIds[entity.id]) return;
+ seenIds[entity.id] = true;
+ var geometry = entity.geometry(graph);
+ if (!context.features().isHiddenFeature(entity, graph, geometry)) {
+ var i3;
+ if (entity.type === "way") {
+ for (i3 = 0; i3 < entity.nodes.length; i3++) {
+ var child = graph.hasEntity(entity.nodes[i3]);
+ if (child) {
+ addChildVertices(child);
+ }
+ }
+ } else if (entity.type === "relation") {
+ for (i3 = 0; i3 < entity.members.length; i3++) {
+ var member = graph.hasEntity(entity.members[i3].id);
+ if (member) {
+ addChildVertices(member);
+ }
+ }
+ } else if (renderAsVertex(entity, graph, wireframe, zoom)) {
+ results[entity.id] = entity;
+ }
+ }
}
+ ids.forEach(function(id2) {
+ var entity = graph.hasEntity(id2);
+ if (!entity) return;
+ if (entity.type === "node") {
+ if (renderAsVertex(entity, graph, wireframe, zoom)) {
+ results[entity.id] = entity;
+ graph.parentWays(entity).forEach(function(entity2) {
+ addChildVertices(entity2);
+ });
+ }
+ } else {
+ addChildVertices(entity);
+ }
+ });
+ return results;
}
- 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 success(geolocation) {
- _position = geolocation;
- var coords = _position.coords;
- _extent = geoExtent([coords.longitude, coords.latitude]).padByMeters(coords.accuracy);
- zoomTo();
- finish();
+ function drawVertices(selection2, graph, entities, filter2, extent, fullRedraw) {
+ var wireframe = context.surface().classed("fill-wireframe");
+ var visualDiff = context.surface().classed("highlight-edited");
+ var zoom = geoScaleToZoom(projection2.scale());
+ var mode = context.mode();
+ var isMoving = mode && /^(add|draw|drag|move|rotate)/.test(mode.id);
+ var base = context.history().base();
+ var drawLayer = selection2.selectAll(".layer-osm.points .points-group.vertices");
+ var touchLayer = selection2.selectAll(".layer-touch.points");
+ if (fullRedraw) {
+ _currPersistent = {};
+ _radii = {};
+ }
+ for (var i3 = 0; i3 < entities.length; i3++) {
+ var entity = entities[i3];
+ var geometry = entity.geometry(graph);
+ var keep = false;
+ if (geometry === "point" && renderAsVertex(entity, graph, wireframe, zoom)) {
+ _currPersistent[entity.id] = entity;
+ keep = true;
+ } else if (geometry === "vertex" && (entity.hasInterestingTags() || entity.isEndpoint(graph) || entity.isConnected(graph) || visualDiff && isEditedNode(entity, base, graph))) {
+ _currPersistent[entity.id] = entity;
+ keep = true;
+ }
+ if (!keep && !fullRedraw) {
+ delete _currPersistent[entity.id];
+ }
+ }
+ var sets2 = {
+ persistent: _currPersistent,
+ // persistent = important vertices (render always)
+ selected: _currSelected,
+ // selected + siblings of selected (render always)
+ hovered: _currHover
+ // hovered + siblings of hovered (render only in draw modes)
+ };
+ var all = Object.assign({}, isMoving ? _currHover : {}, _currSelected, _currPersistent);
+ var filterRendered = function(d2) {
+ return d2.id in _currPersistent || d2.id in _currSelected || d2.id in _currHover || filter2(d2);
+ };
+ drawLayer.call(draw, graph, currentVisible(all), sets2, filterRendered);
+ var filterTouch = function(d2) {
+ return isMoving ? true : filterRendered(d2);
+ };
+ touchLayer.call(drawTargets, graph, currentVisible(all), filterTouch);
+ function currentVisible(which) {
+ return Object.keys(which).map(graph.hasEntity, graph).filter(function(entity2) {
+ return entity2 && entity2.intersects(extent, graph);
+ });
+ }
}
- function error() {
- if (_position) {
- zoomTo();
+ drawVertices.drawSelected = function(selection2, graph, extent) {
+ var wireframe = context.surface().classed("fill-wireframe");
+ var zoom = geoScaleToZoom(projection2.scale());
+ _prevSelected = _currSelected || {};
+ if (context.map().isInWideSelection()) {
+ _currSelected = {};
+ context.selectedIDs().forEach(function(id2) {
+ var entity = graph.hasEntity(id2);
+ if (!entity) return;
+ if (entity.type === "node") {
+ if (renderAsVertex(entity, graph, wireframe, zoom)) {
+ _currSelected[entity.id] = entity;
+ }
+ }
+ });
} else {
- context.ui().flash.label(_t.html("geolocate.location_unavailable")).iconName("#iD-icon-geolocate")();
+ _currSelected = getSiblingAndChildVertices(context.selectedIDs(), graph, wireframe, zoom);
}
- finish();
- }
- function finish() {
- _locating.close();
- if (_timeoutID) {
- clearTimeout(_timeoutID);
+ var filter2 = function(d2) {
+ return d2.id in _prevSelected;
+ };
+ drawVertices(selection2, graph, Object.values(_prevSelected), filter2, extent, false);
+ };
+ drawVertices.drawHover = function(selection2, graph, target, extent) {
+ if (target === _currHoverTarget) return;
+ var wireframe = context.surface().classed("fill-wireframe");
+ var zoom = geoScaleToZoom(projection2.scale());
+ _prevHover = _currHover || {};
+ _currHoverTarget = target;
+ var entity = target && target.properties && target.properties.entity;
+ if (entity) {
+ _currHover = getSiblingAndChildVertices([entity.id], graph, wireframe, zoom);
+ } else {
+ _currHover = {};
}
- _timeoutID = void 0;
- }
- 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.html("geolocate.title")).keys([_t("geolocate.key")]));
- context.keybinding().on(_t("geolocate.key"), click);
+ var filter2 = function(d2) {
+ return d2.id in _prevHover;
+ };
+ drawVertices(selection2, graph, Object.values(_prevHover), filter2, extent, false);
};
+ return drawVertices;
}
- // 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.html("");
- var list = selection2.append("ul").attr("class", "background-info");
- list.append("li").html(_currSourceName);
- _metadataKeys.forEach(function(k) {
- if (isDG && k === "vintage")
- return;
- list.append("li").attr("class", "background-info-list-" + k).classed("hide", !_metadata[k]).call(_t.append("info_panels.background." + k, { suffix: ":" })).append("span").attr("class", "background-info-span-" + k).text(_metadata[k]);
- });
- 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);
- });
+ // modules/ui/length_indicator.js
+ function uiLengthIndicator(maxChars) {
+ var _wrap = select_default2(null);
+ var _tooltip = uiPopover("tooltip max-length-warning").placement("bottom").hasArrow(true).content(() => (selection2) => {
+ selection2.text("");
+ selection2.call(svgIcon("#iD-icon-alert", "inline"));
+ selection2.call(_t.append("inspector.max_length_reached", { maxChars }));
+ });
+ var _silent = false;
+ var lengthIndicator = function(selection2) {
+ _wrap = selection2.selectAll("span.length-indicator-wrap").data([0]);
+ _wrap = _wrap.enter().append("span").merge(_wrap).classed("length-indicator-wrap", true);
+ selection2.call(_tooltip);
+ };
+ lengthIndicator.update = function(val) {
+ const strLen = utilUnicodeCharsCount(utilCleanOsmString(val, Number.POSITIVE_INFINITY));
+ let indicator = _wrap.selectAll("span.length-indicator").data([strLen]);
+ indicator.enter().append("span").merge(indicator).classed("length-indicator", true).classed("limit-reached", (d2) => d2 > maxChars).style("border-right-width", (d2) => "".concat(Math.abs(maxChars - d2) * 2, "px")).style("margin-right", (d2) => d2 > maxChars ? "".concat((maxChars - d2) * 2, "px") : 0).style("opacity", (d2) => d2 > maxChars * 0.8 ? Math.min(1, (d2 / maxChars - 0.8) / (1 - 0.8)) : 0).style("pointer-events", (d2) => d2 > maxChars * 0.8 ? null : "none");
+ if (_silent) return;
+ if (strLen > maxChars) {
+ _tooltip.show();
+ } else {
+ _tooltip.hide();
}
- ["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);
- }
- }
- });
- }
- 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 d = tile.datum();
- var zoom = d && d.length >= 3 && d[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 (!d || !d.length >= 3)
- return;
- background.baseLayerSource().getMetadata(center, d, 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(k) {
- if (k === "zoom" || k === "vintage")
- return;
- var val = result[k];
- _metadata[k] = val;
- selection2.selectAll(".background-info-list-" + k).classed("hide", !val).selectAll(".background-info-span-" + k).text(val);
- });
- });
- }
- 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);
- });
};
- panel.off = function() {
- context.map().on("drawn.info-background", null).on("move.info-background", null);
+ lengthIndicator.silent = function(val) {
+ if (!arguments.length) return _silent;
+ _silent = val;
+ return lengthIndicator;
};
- panel.id = "background";
- panel.label = _t.html("info_panels.background.title");
- panel.key = _t("info_panels.background.key");
- return panel;
+ return lengthIndicator;
}
- // 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 d = new Date(timestamp);
- if (isNaN(d.getTime()))
- return _t("info_panels.history.unknown");
- return d.toLocaleString(_mainLocalizer.localeCode(), options2);
+ // modules/ui/fields/combo.js
+ function uiFieldCombo(field, context) {
+ var dispatch14 = dispatch_default("change");
+ var _isMulti = field.type === "multiCombo" || field.type === "manyCombo";
+ var _isNetwork = field.type === "networkCombo";
+ var _isSemi = field.type === "semiCombo";
+ var _showTagInfoSuggestions = field.type !== "manyCombo" && field.autoSuggestions !== false;
+ var _allowCustomValues = field.type !== "manyCombo" && field.customValues !== false;
+ var _snake_case = field.snake_case || field.snake_case === void 0;
+ var _combobox = uiCombobox(context, "combo-" + field.safeid).caseSensitive(field.caseSensitive).minItems(1);
+ var _container = select_default2(null);
+ var _inputWrap = select_default2(null);
+ var _input = select_default2(null);
+ var _lengthIndicator = uiLengthIndicator(context.maxCharsForTagValue());
+ var _comboData = [];
+ var _multiData = [];
+ var _entityIDs = [];
+ var _tags;
+ var _countryCode;
+ var _staticPlaceholder;
+ var _dataDeprecated = [];
+ _mainFileFetcher.get("deprecated").then(function(d2) {
+ _dataDeprecated = d2;
+ }).catch(function() {
+ });
+ if (_isMulti && field.key && /[^:]$/.test(field.key)) {
+ field.key += ":";
}
- 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 snake(s2) {
+ return s2.replace(/\s+/g, "_");
}
- function displayChangeset(selection2, changeset) {
- if (!changeset) {
- selection2.append("span").call(_t.append("info_panels.history.unknown"));
- return;
- }
- 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 clean2(s2) {
+ return s2.split(";").map(function(s3) {
+ return s3.trim();
+ }).join(";");
}
- 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(e) {
- return context.hasEntity(e);
- });
- if (selected.length) {
- entity = context.entity(selected[0]);
- }
+ function tagValue(dval) {
+ dval = clean2(dval || "");
+ var found = getOptions(true).find(function(o2) {
+ return o2.key && clean2(o2.value) === dval;
+ });
+ if (found) return found.key;
+ if (field.type === "typeCombo" && !dval) {
+ return "yes";
}
- 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 }));
+ return restrictTagValueSpelling(dval) || void 0;
+ }
+ function restrictTagValueSpelling(dval) {
+ if (_snake_case) {
+ dval = snake(dval);
}
- if (!singular)
- return;
- if (entity) {
- selection2.call(redrawEntity, entity);
- } else if (note) {
- selection2.call(redrawNote, note);
+ if (!field.caseSensitive) {
+ dval = dval.toLowerCase();
}
+ return dval;
}
- function redrawNote(selection2, note) {
- if (!note || note.isNew()) {
- selection2.append("div").call(_t.append("info_panels.history.note_no_history"));
- return;
- }
- var list = selection2.append("ul");
- list.append("li").call(_t.append("info_panels.history.note_comments", { suffix: ":" })).append("span").text(note.comments.length);
- if (note.comments.length) {
- list.append("li").call(_t.append("info_panels.history.note_created_date", { suffix: ":" })).append("span").text(displayTimestamp(note.comments[0].date));
- list.append("li").call(_t.append("info_panels.history.note_created_user", { suffix: ":" })).call(displayUser, note.comments[0].user);
+ function getLabelId(field2, v2) {
+ return field2.hasTextForStringId("options.".concat(v2, ".title")) ? "options.".concat(v2, ".title") : "options.".concat(v2);
+ }
+ function displayValue(tval) {
+ tval = tval || "";
+ var stringsField = field.resolveReference("stringsCrossReference");
+ const labelId = getLabelId(stringsField, tval);
+ if (stringsField.hasTextForStringId(labelId)) {
+ return stringsField.t(labelId, { default: tval });
}
- 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"));
+ if (field.type === "typeCombo" && tval.toLowerCase() === "yes") {
+ return "";
}
+ return tval;
}
- function redrawEntity(selection2, entity) {
- if (!entity || entity.isNew()) {
- selection2.append("div").call(_t.append("info_panels.history.no_history"));
- return;
+ function renderValue(tval) {
+ tval = tval || "";
+ var stringsField = field.resolveReference("stringsCrossReference");
+ const labelId = getLabelId(stringsField, tval);
+ if (stringsField.hasTextForStringId(labelId)) {
+ return stringsField.t.append(labelId, { default: tval });
}
- 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"));
+ if (field.type === "typeCombo" && tval.toLowerCase() === "yes") {
+ tval = "";
}
- 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 list = selection2.append("ul");
- list.append("li").call(_t.append("info_panels.history.version", { suffix: ":" })).append("span").text(entity.version);
- list.append("li").call(_t.append("info_panels.history.last_edit", { suffix: ":" })).append("span").text(displayTimestamp(entity.timestamp));
- list.append("li").call(_t.append("info_panels.history.edited_by", { suffix: ":" })).call(displayUser, entity.user);
- list.append("li").call(_t.append("info_panels.history.changeset", { suffix: ":" })).call(displayChangeset, entity.changeset);
+ return (selection2) => selection2.text(tval);
}
- var panel = function(selection2) {
- selection2.call(redraw);
- context.map().on("drawn.info-history", function() {
- selection2.call(redraw);
- });
- context.on("enter.info-history", function() {
- selection2.call(redraw);
+ function objectDifference(a2, b2) {
+ return a2.filter(function(d1) {
+ return !b2.some(function(d2) {
+ return d1.value === d2.value;
+ });
});
- };
- panel.off = function() {
- context.map().on("drawn.info-history", null);
- context.on("enter.info-history", null);
- };
- panel.id = "history";
- panel.label = _t.html("info_panels.history.title");
- panel.key = _t("info_panels.history.key");
- return panel;
- }
-
- // modules/util/units.js
- var OSM_PRECISION = 7;
- function displayLength(m, isImperial) {
- var d = m * (isImperial ? 3.28084 : 1);
- var unit2;
- if (isImperial) {
- if (d >= 5280) {
- d /= 5280;
- unit2 = "miles";
- } else {
- unit2 = "feet";
+ }
+ function initCombo(selection2, attachTo) {
+ if (!_allowCustomValues) {
+ selection2.attr("readonly", "readonly");
}
- } else {
- if (d >= 1e3) {
- d /= 1e3;
- unit2 = "kilometers";
+ if (_showTagInfoSuggestions && services.taginfo) {
+ selection2.call(_combobox.fetcher(setTaginfoValues), attachTo);
+ setTaginfoValues("", setPlaceholder);
} else {
- unit2 = "meters";
+ selection2.call(_combobox, attachTo);
+ setTimeout(() => setStaticValues(setPlaceholder), 0);
}
}
- return _t("units." + unit2, {
- quantity: d.toLocaleString(_mainLocalizer.localeCode(), {
- maximumSignificantDigits: 4
- })
- });
- }
- function displayArea(m2, isImperial) {
- var locale2 = _mainLocalizer.localeCode();
- var d = m2 * (isImperial ? 10.7639111056 : 1);
- var d1, d2, area;
- var unit1 = "";
- var unit2 = "";
- if (isImperial) {
- if (d >= 6969600) {
- d1 = d / 27878400;
- unit1 = "square_miles";
- } else {
- d1 = d;
- unit1 = "square_feet";
- }
- if (d > 4356 && d < 4356e4) {
- d2 = d / 43560;
- unit2 = "acres";
- }
- } else {
- if (d >= 25e4) {
- d1 = d / 1e6;
- unit1 = "square_kilometers";
+ function getOptions(allOptions) {
+ var stringsField = field.resolveReference("stringsCrossReference");
+ if (!(field.options || stringsField.options)) return [];
+ let options2;
+ if (allOptions !== true) {
+ options2 = field.options || stringsField.options;
} else {
- d1 = d;
- unit1 = "square_meters";
- }
- if (d > 1e3 && d < 1e7) {
- d2 = d / 1e4;
- unit2 = "hectares";
+ options2 = [].concat(field.options, stringsField.options).filter(Boolean);
}
- }
- area = _t("units." + unit1, {
- quantity: d1.toLocaleString(locale2, {
- maximumSignificantDigits: 4
- })
- });
- if (d2) {
- return _t("units.area_pair", {
- area1: area,
- area2: _t("units." + unit2, {
- quantity: d2.toLocaleString(locale2, {
- maximumSignificantDigits: 2
- })
- })
- });
- } else {
- return area;
- }
- }
- function wrap(x, min3, max3) {
- var d = max3 - min3;
- return ((x - min3) % d + d) % d + min3;
- }
- function clamp2(x, min3, max3) {
- return Math.max(min3, Math.min(x, max3));
- }
- function displayCoordinate(deg, pos, neg) {
- var locale2 = _mainLocalizer.localeCode();
- var min3 = (Math.abs(deg) - Math.floor(Math.abs(deg))) * 60;
- var sec = (min3 - Math.floor(min3)) * 60;
- var displayDegrees = _t("units.arcdegrees", {
- quantity: Math.floor(Math.abs(deg)).toLocaleString(locale2)
- });
- var displayCoordinate2;
- if (Math.floor(sec) > 0) {
- displayCoordinate2 = displayDegrees + _t("units.arcminutes", {
- quantity: Math.floor(min3).toLocaleString(locale2)
- }) + _t("units.arcseconds", {
- quantity: Math.round(sec).toLocaleString(locale2)
- });
- } else if (Math.floor(min3) > 0) {
- displayCoordinate2 = displayDegrees + _t("units.arcminutes", {
- quantity: Math.round(min3).toLocaleString(locale2)
- });
- } else {
- displayCoordinate2 = _t("units.arcdegrees", {
- quantity: Math.round(Math.abs(deg)).toLocaleString(locale2)
+ return options2.map(function(v2) {
+ const labelId = getLabelId(stringsField, v2);
+ return {
+ key: v2,
+ value: stringsField.t(labelId, { default: v2 }),
+ title: stringsField.t("options.".concat(v2, ".description"), { default: v2 }),
+ display: addComboboxIcons(stringsField.t.append(labelId, { default: v2 }), v2),
+ klass: stringsField.hasTextForStringId(labelId) ? "" : "raw-option"
+ };
});
}
- if (deg === 0) {
- return displayCoordinate2;
- } else {
- return _t("units.coordinate", {
- coordinate: displayCoordinate2,
- direction: _t("units." + (deg > 0 ? pos : neg))
- });
+ function hasStaticValues() {
+ return getOptions().length > 0;
}
- }
- function dmsCoordinatePair(coord2) {
- return _t("units.coordinate_pair", {
- latitude: displayCoordinate(clamp2(coord2[1], -90, 90), "north", "south"),
- longitude: displayCoordinate(wrap(coord2[0], -180, 180), "east", "west")
- });
- }
- function decimalCoordinatePair(coord2) {
- return _t("units.coordinate_pair", {
- latitude: clamp2(coord2[1], -90, 90).toFixed(OSM_PRECISION),
- longitude: wrap(coord2[0], -180, 180).toFixed(OSM_PRECISION)
- });
- }
-
- // modules/ui/panels/location.js
- function uiPanelLocation(context) {
- var currLocation = "";
- function redraw(selection2) {
- selection2.html("");
- var list = selection2.append("ul");
- var coord2 = context.map().mouseCoordinates();
- if (coord2.some(isNaN)) {
- coord2 = context.map().center();
+ function setStaticValues(callback, filter2) {
+ _comboData = getOptions();
+ if (filter2 !== void 0) {
+ _comboData = _comboData.filter(filter2);
}
- list.append("li").text(dmsCoordinatePair(coord2)).append("li").text(decimalCoordinatePair(coord2));
- selection2.append("div").attr("class", "location-info").text(currLocation || " ");
- debouncedGetLocation(selection2, coord2);
+ _comboData = objectDifference(_comboData, _multiData);
+ _combobox.data(_comboData);
+ if (callback) callback(_comboData);
}
- 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);
- });
+ function setTaginfoValues(q2, callback) {
+ var queryFilter = (d2) => d2.value.toLowerCase().includes(q2.toLowerCase()) || d2.key.toLowerCase().includes(q2.toLowerCase());
+ if (hasStaticValues()) {
+ setStaticValues(callback, queryFilter);
}
- }
- var panel = function(selection2) {
- selection2.call(redraw);
- context.surface().on(("PointerEvent" in window ? "pointer" : "mouse") + "move.info-location", function() {
- selection2.call(redraw);
+ var stringsField = field.resolveReference("stringsCrossReference");
+ var fn = _isMulti ? "multikeys" : "values";
+ var query = (_isMulti ? field.key : "") + q2;
+ var hasCountryPrefix = _isNetwork && _countryCode && _countryCode.indexOf(q2.toLowerCase()) === 0;
+ if (hasCountryPrefix) {
+ query = _countryCode + ":";
+ }
+ var params = {
+ debounce: q2 !== "",
+ key: field.key,
+ query
+ };
+ if (_entityIDs.length) {
+ params.geometry = context.graph().geometry(_entityIDs[0]);
+ }
+ services.taginfo[fn](params, function(err, data) {
+ if (err) return;
+ data = data.filter((d2) => field.type !== "typeCombo" || d2.value !== "yes");
+ data = data.filter((d2) => {
+ var value = d2.value;
+ if (_isMulti) {
+ value = value.slice(field.key.length);
+ }
+ return value === restrictTagValueSpelling(value);
+ });
+ var deprecatedValues = osmEntity.deprecatedTagValuesByKey(_dataDeprecated)[field.key];
+ if (deprecatedValues) {
+ data = data.filter((d2) => !deprecatedValues.includes(d2.value));
+ }
+ if (hasCountryPrefix) {
+ data = data.filter((d2) => d2.value.toLowerCase().indexOf(_countryCode + ":") === 0);
+ }
+ const additionalOptions = (field.options || stringsField.options || []).filter((v2) => !data.some((dv) => dv.value === (_isMulti ? field.key + v2 : v2))).map((v2) => ({ value: v2 }));
+ _container.classed("empty-combobox", data.length === 0);
+ _comboData = data.concat(additionalOptions).map(function(d2) {
+ var v2 = d2.value;
+ if (_isMulti) v2 = v2.replace(field.key, "");
+ const labelId = getLabelId(stringsField, v2);
+ var isLocalizable = stringsField.hasTextForStringId(labelId);
+ var label = stringsField.t(labelId, { default: v2 });
+ return {
+ key: v2,
+ value: label,
+ title: stringsField.t("options.".concat(v2, ".description"), { default: isLocalizable ? v2 : d2.title !== label ? d2.title : "" }),
+ display: addComboboxIcons(stringsField.t.append(labelId, { default: v2 }), v2),
+ klass: isLocalizable ? "" : "raw-option"
+ };
+ });
+ _comboData = _comboData.filter(queryFilter);
+ _comboData = objectDifference(_comboData, _multiData);
+ if (callback) callback(_comboData, hasStaticValues());
});
- };
- panel.off = function() {
- context.surface().on(".info-location", null);
- };
- panel.id = "location";
- panel.label = _t.html("info_panels.location.title");
- panel.key = _t("info_panels.location.key");
- return panel;
- }
-
- // modules/ui/panels/measurement.js
- function uiPanelMeasurement(context) {
- function radiansToMeters(r) {
- return r * 63710071809e-4;
- }
- function steradiansToSqmeters(r) {
- return r / (4 * Math.PI) * 510065621724e3;
}
- 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];
+ function addComboboxIcons(disp, value) {
+ const iconsField = field.resolveReference("iconsCrossReference");
+ if (iconsField.icons) {
+ return function(selection2) {
+ var span = selection2.insert("span", ":first-child").attr("class", "tag-value-icon");
+ if (iconsField.icons[value]) {
+ span.call(svgIcon("#".concat(iconsField.icons[value])));
+ }
+ disp.call(this, selection2);
+ };
}
- return result;
+ return disp;
}
- var _isImperial = !_mainLocalizer.usesMetric();
- function redraw(selection2) {
- var graph = context.graph();
- var selectedNoteID = context.selectedNoteID();
- var osm = services.osm;
- var localeCode = _mainLocalizer.localeCode();
- var heading;
- var center, location, centroid;
- var closed, geometry;
- var totalNodeCount, length = 0, area = 0, distance;
- if (selectedNoteID && osm) {
- var note = osm.getNote(selectedNoteID);
- heading = _t.html("note.note") + " " + selectedNoteID;
- location = note.loc;
- geometry = "note";
+ function setPlaceholder(values) {
+ if (_isMulti || _isSemi) {
+ _staticPlaceholder = field.placeholder() || _t("inspector.add");
} else {
- var selectedIDs = context.selectedIDs().filter(function(id2) {
- return context.hasEntity(id2);
+ var vals = values.map(function(d2) {
+ return d2.value;
+ }).filter(function(s2) {
+ return s2.length < 20;
});
- var selected = selectedIDs.map(function(id2) {
- return context.entity(id2);
+ var placeholders = vals.length > 1 ? vals : values.map(function(d2) {
+ return d2.key;
});
- heading = selected.length === 1 ? selected[0].id : _t.html("info_panels.selected", { n: selected.length });
- if (selected.length) {
- var extent = geoExtent();
- for (var i2 in selected) {
- var entity = selected[i2];
- 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);
- length += 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();
- }
- }
- }
- selection2.html("");
- if (heading) {
- selection2.append("h4").attr("class", "measurement-heading").html(heading);
- }
- var list = selection2.append("ul");
- var coordItem;
- if (geometry) {
- list.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));
+ _staticPlaceholder = field.placeholder() || placeholders.slice(0, 3).join(", ");
}
- if (totalNodeCount) {
- list.append("li").call(_t.append("info_panels.measurement.node_count", { suffix: ":" })).append("span").text(totalNodeCount.toLocaleString(localeCode));
+ if (!/(â¦|\.\.\.)$/.test(_staticPlaceholder)) {
+ _staticPlaceholder += "\u2026";
}
- if (area) {
- list.append("li").call(_t.append("info_panels.measurement.area", { suffix: ":" })).append("span").text(displayArea(area, _isImperial));
+ var ph;
+ if (!_isMulti && !_isSemi && _tags && Array.isArray(_tags[field.key])) {
+ ph = _t("inspector.multiple_values");
+ } else {
+ ph = _staticPlaceholder;
}
- if (length) {
- list.append("li").call(_t.append("info_panels.measurement." + (closed ? "perimeter" : "length"), { suffix: ":" })).append("span").text(displayLength(length, _isImperial));
+ _container.selectAll("input").attr("placeholder", ph);
+ var hideAdd = !_allowCustomValues && !values.length;
+ _container.selectAll(".chiplist .input-wrap").style("display", hideAdd ? "none" : null);
+ }
+ function change() {
+ var t2 = {};
+ var val;
+ if (_isMulti || _isSemi) {
+ var vals;
+ if (_isMulti) {
+ vals = [tagValue(utilGetSetValue(_input))];
+ } else if (_isSemi) {
+ val = tagValue(utilGetSetValue(_input)) || "";
+ val = val.replace(/,/g, ";");
+ vals = val.split(";");
+ }
+ vals = vals.filter(Boolean);
+ if (!vals.length) return;
+ _container.classed("active", false);
+ utilGetSetValue(_input, "");
+ if (_isMulti) {
+ utilArrayUniq(vals).forEach(function(v2) {
+ var key = (field.key || "") + v2;
+ if (_tags) {
+ var old = _tags[key];
+ if (typeof old === "string" && old.toLowerCase() !== "no") return;
+ }
+ key = context.cleanTagKey(key);
+ field.keys.push(key);
+ t2[key] = "yes";
+ });
+ } else if (_isSemi) {
+ var arr = _multiData.map(function(d2) {
+ return d2.key;
+ });
+ arr = arr.concat(vals);
+ t2[field.key] = context.cleanTagValue(utilArrayUniq(arr).filter(Boolean).join(";"));
+ }
+ window.setTimeout(function() {
+ _input.node().focus();
+ }, 10);
+ } else {
+ var rawValue = utilGetSetValue(_input);
+ if (!rawValue && Array.isArray(_tags[field.key])) return;
+ val = context.cleanTagValue(tagValue(rawValue));
+ t2[field.key] = val || void 0;
}
- if (typeof distance === "number") {
- list.append("li").call(_t.append("info_panels.measurement.distance", { suffix: ":" })).append("span").text(displayLength(distance, _isImperial));
+ dispatch14.call("change", this, t2);
+ }
+ function removeMultikey(d3_event, d2) {
+ d3_event.preventDefault();
+ d3_event.stopPropagation();
+ var t2 = {};
+ if (_isMulti) {
+ t2[d2.key] = void 0;
+ } else if (_isSemi) {
+ var arr = _multiData.map(function(md) {
+ return md.key === d2.key ? null : md.key;
+ }).filter(Boolean);
+ arr = utilArrayUniq(arr);
+ t2[field.key] = arr.length ? arr.join(";") : void 0;
+ _lengthIndicator.update(t2[field.key]);
}
- if (location) {
- coordItem = list.append("li").call(_t.append("info_panels.measurement.location", { suffix: ":" }));
- coordItem.append("span").text(dmsCoordinatePair(location));
- coordItem.append("span").text(decimalCoordinatePair(location));
+ dispatch14.call("change", this, t2);
+ }
+ function invertMultikey(d3_event, d2) {
+ d3_event.preventDefault();
+ d3_event.stopPropagation();
+ var t2 = {};
+ if (_isMulti) {
+ t2[d2.key] = _tags[d2.key] === "yes" ? "no" : "yes";
}
- if (centroid) {
- coordItem = list.append("li").call(_t.append("info_panels.measurement.centroid", { suffix: ":" }));
- coordItem.append("span").text(dmsCoordinatePair(centroid));
- coordItem.append("span").text(decimalCoordinatePair(centroid));
+ dispatch14.call("change", this, t2);
+ }
+ function combo(selection2) {
+ _container = selection2.selectAll(".form-field-input-wrap").data([0]);
+ var type2 = _isMulti || _isSemi ? "multicombo" : "combo";
+ _container = _container.enter().append("div").attr("class", "form-field-input-wrap form-field-input-" + type2).merge(_container);
+ if (_isMulti || _isSemi) {
+ _container = _container.selectAll(".chiplist").data([0]);
+ var listClass = "chiplist";
+ if (field.key === "destination" || field.key === "via") {
+ listClass += " full-line-chips";
+ }
+ _container = _container.enter().append("ul").attr("class", listClass).on("click", function() {
+ window.setTimeout(function() {
+ _input.node().focus();
+ }, 10);
+ }).merge(_container);
+ _inputWrap = _container.selectAll(".input-wrap").data([0]);
+ _inputWrap = _inputWrap.enter().append("li").attr("class", "input-wrap").merge(_inputWrap);
+ var hideAdd = !_allowCustomValues && !_comboData.length;
+ _inputWrap.style("display", hideAdd ? "none" : null);
+ _input = _inputWrap.selectAll("input").data([0]);
+ } else {
+ _input = _container.selectAll("input").data([0]);
}
- if (center) {
- coordItem = list.append("li").call(_t.append("info_panels.measurement.center", { suffix: ":" }));
- coordItem.append("span").text(dmsCoordinatePair(center));
- coordItem.append("span").text(decimalCoordinatePair(center));
+ _input = _input.enter().append("input").attr("type", "text").attr("id", field.domId).call(utilNoAuto).call(initCombo, _container).merge(_input);
+ if (_isSemi) {
+ _inputWrap.call(_lengthIndicator);
+ } else if (!_isMulti) {
+ _container.call(_lengthIndicator);
}
- if (length || 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);
- });
+ if (_isNetwork) {
+ var extent = combinedEntityExtent();
+ var countryCode = extent && iso1A2Code(extent.center());
+ _countryCode = countryCode && countryCode.toLowerCase();
}
- }
- var panel = function(selection2) {
- selection2.call(redraw);
- context.map().on("drawn.info-measurement", function() {
- selection2.call(redraw);
+ _input.on("change", change).on("blur", change).on("input", function() {
+ let val = utilGetSetValue(_input);
+ updateIcon(val);
+ if (_isSemi && _tags[field.key]) {
+ val += ";" + _tags[field.key];
+ }
+ _lengthIndicator.update(val);
});
- context.on("enter.info-measurement", function() {
- selection2.call(redraw);
+ _input.on("keydown.field", function(d3_event) {
+ switch (d3_event.keyCode) {
+ case 13:
+ _input.node().blur();
+ d3_event.stopPropagation();
+ break;
+ }
});
- };
- panel.off = function() {
- context.map().on("drawn.info-measurement", null);
- context.on("enter.info-measurement", null);
- };
- panel.id = "measurement";
- panel.label = _t.html("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(k) {
- if (!panels[k]) {
- panels[k] = uiInfoPanels[k](context);
- active[k] = false;
- }
- });
- function info(selection2) {
- function redraw() {
- var activeids = ids.filter(function(k) {
- return active[k];
- }).sort();
- var containers = infoPanels.selectAll(".panel-container").data(activeids, function(k) {
- return k;
- });
- containers.exit().style("opacity", 1).transition().duration(200).style("opacity", 0).on("end", function(d) {
- select_default2(this).call(panels[d].off).remove();
- });
- var enter = containers.enter().append("div").attr("class", function(d) {
- return "fillD2 panel-container panel-container-" + d;
- });
- enter.style("opacity", 0).transition().duration(200).style("opacity", 1);
- var title = enter.append("div").attr("class", "panel-title fillD2");
- title.append("h3").html(function(d) {
- return panels[d].label;
- });
- title.append("button").attr("class", "close").attr("title", _t("icons.close")).on("click", function(d3_event, d) {
- d3_event.stopImmediatePropagation();
- d3_event.preventDefault();
- info.toggle(d);
- }).call(svgIcon("#iD-icon-close"));
- enter.append("div").attr("class", function(d) {
- return "panel-content panel-content-" + d;
+ if (_isMulti || _isSemi) {
+ _combobox.on("accept", function() {
+ _input.node().blur();
+ _input.node().focus();
});
- infoPanels.selectAll(".panel-content").each(function(d) {
- select_default2(this).call(panels[d]);
+ _input.on("focus", function() {
+ _container.classed("active", true);
});
}
- info.toggle = function(which) {
- var activeids = ids.filter(function(k) {
- return active[k];
- });
- if (which) {
- active[which] = !active[which];
- if (activeids.length === 1 && activeids[0] === which) {
- wasActive = [which];
+ _combobox.on("cancel", function() {
+ _input.node().blur();
+ }).on("update", function() {
+ updateIcon(utilGetSetValue(_input));
+ });
+ }
+ function updateIcon(value) {
+ value = tagValue(value);
+ let container = _container;
+ if (field.type === "multiCombo" || field.type === "semiCombo") {
+ container = _container.select(".input-wrap");
+ }
+ const iconsField = field.resolveReference("iconsCrossReference");
+ if (iconsField.icons) {
+ container.selectAll(".tag-value-icon").remove();
+ if (iconsField.icons[value]) {
+ container.selectAll(".tag-value-icon").data([value]).enter().insert("div", "input").attr("class", "tag-value-icon").call(svgIcon("#".concat(iconsField.icons[value])));
+ }
+ }
+ }
+ combo.tags = function(tags) {
+ _tags = tags;
+ var stringsField = field.resolveReference("stringsCrossReference");
+ var isMixed = Array.isArray(tags[field.key]);
+ var showsValue = (value) => !isMixed && value && !(field.type === "typeCombo" && value === "yes");
+ var isRawValue = (value) => showsValue(value) && !stringsField.hasTextForStringId("options.".concat(value)) && !stringsField.hasTextForStringId("options.".concat(value, ".title"));
+ var isKnownValue = (value) => showsValue(value) && !isRawValue(value);
+ var isReadOnly = !_allowCustomValues;
+ if (_isMulti || _isSemi) {
+ _multiData = [];
+ var maxLength;
+ if (_isMulti) {
+ for (var k2 in tags) {
+ if (field.key && k2.indexOf(field.key) !== 0) continue;
+ if (!field.key && field.keys.indexOf(k2) === -1) continue;
+ var v2 = tags[k2];
+ var suffix = field.key ? k2.slice(field.key.length) : k2;
+ _multiData.push({
+ key: k2,
+ value: displayValue(suffix),
+ display: addComboboxIcons(renderValue(suffix), suffix),
+ state: typeof v2 === "string" ? v2.toLowerCase() : "",
+ isMixed: Array.isArray(v2)
+ });
}
- 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(k) {
- active[k] = false;
+ if (field.key) {
+ field.keys = _multiData.map(function(d2) {
+ return d2.key;
});
+ maxLength = context.maxCharsForTagKey() - utilUnicodeCharsCount(field.key);
} else {
- wasActive.forEach(function(k) {
- active[k] = true;
+ maxLength = context.maxCharsForTagKey();
+ }
+ } else if (_isSemi) {
+ var allValues = [];
+ var commonValues;
+ if (Array.isArray(tags[field.key])) {
+ tags[field.key].forEach(function(tagVal) {
+ var thisVals = utilArrayUniq((tagVal || "").split(";")).filter(Boolean);
+ allValues = allValues.concat(thisVals);
+ if (!commonValues) {
+ commonValues = thisVals;
+ } else {
+ commonValues = commonValues.filter((value) => thisVals.includes(value));
+ }
});
+ allValues = utilArrayUniq(allValues).filter(Boolean);
+ } else {
+ allValues = utilArrayUniq((tags[field.key] || "").split(";")).filter(Boolean);
+ commonValues = allValues;
+ }
+ _multiData = allValues.map(function(v3) {
+ return {
+ key: v3,
+ value: displayValue(v3),
+ display: addComboboxIcons(renderValue(v3), v3),
+ isMixed: !commonValues.includes(v3)
+ };
+ });
+ var currLength = utilUnicodeCharsCount(commonValues.join(";"));
+ maxLength = context.maxCharsForTagValue() - currLength;
+ if (currLength > 0) {
+ maxLength -= 1;
}
}
- 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(k) {
- var key = _t("info_panels." + k + ".key", { default: null });
- if (!key)
- return;
- context.keybinding().on(uiCmd("\u2318\u21E7" + key), function(d3_event) {
- d3_event.stopImmediatePropagation();
- d3_event.preventDefault();
- info.toggle(k);
+ maxLength = Math.max(0, maxLength);
+ var hideAdd = maxLength <= 0 || !_allowCustomValues && !_comboData.length;
+ _container.selectAll(".chiplist .input-wrap").style("display", hideAdd ? "none" : null);
+ var allowDragAndDrop = _isSemi && !Array.isArray(tags[field.key]);
+ var chips = _container.selectAll(".chip").data(_multiData);
+ chips.exit().remove();
+ var enter = chips.enter().insert("li", ".input-wrap").attr("class", "chip");
+ enter.append("span");
+ const field_buttons = enter.append("div").attr("class", "field_buttons");
+ field_buttons.append("a").attr("class", "remove");
+ chips = chips.merge(enter).order().classed("raw-value", function(d2) {
+ var k3 = d2.key;
+ if (_isMulti) k3 = k3.replace(field.key, "");
+ return !stringsField.hasTextForStringId("options." + k3);
+ }).classed("draggable", allowDragAndDrop).classed("mixed", function(d2) {
+ return d2.isMixed;
+ }).attr("title", function(d2) {
+ if (d2.isMixed) {
+ return _t("inspector.unshared_value_tooltip");
+ }
+ if (!["yes", "no"].includes(d2.state)) {
+ return d2.state;
+ }
+ return null;
+ }).classed("negated", (d2) => d2.state === "no");
+ if (!_isSemi) {
+ chips.selectAll("input[type=checkbox]").remove();
+ chips.insert("input", "span").attr("type", "checkbox").property("checked", (d2) => d2.state === "yes").property("indeterminate", (d2) => d2.isMixed || !["yes", "no"].includes(d2.state)).on("click", invertMultikey);
+ }
+ if (allowDragAndDrop) {
+ registerDragAndDrop(chips);
+ }
+ chips.each(function(d2) {
+ const selection2 = select_default2(this);
+ const text_span = selection2.select("span");
+ const field_buttons2 = selection2.select(".field_buttons");
+ const clean_value = d2.value.trim();
+ text_span.text("");
+ if (!field_buttons2.select("button").empty()) {
+ field_buttons2.select("button").remove();
+ }
+ if (clean_value.startsWith("https://")) {
+ text_span.text(clean_value);
+ field_buttons2.append("button").call(svgIcon("#iD-icon-out-link")).attr("class", "form-field-button foreign-id-permalink").attr("title", () => _t("icons.visit_website")).attr("aria-label", () => _t("icons.visit_website")).on("click", function(d3_event) {
+ d3_event.preventDefault();
+ window.open(clean_value, "_blank");
+ });
+ return;
+ }
+ if (d2.display) {
+ d2.display(text_span);
+ return;
+ }
+ text_span.text(d2.value);
});
- });
- }
- return info;
- }
-
- // modules/ui/intro/helper.js
- function pointBox(loc, context) {
- var rect = context.surfaceRect();
- var point = context.curtainProjection(loc);
- return {
- left: point[0] + rect.left - 40,
- top: point[1] + rect.top - 60,
- width: 80,
- height: 90
- };
- }
- function pad(locOrBox, padding, context) {
- var box;
- if (locOrBox instanceof Array) {
- var rect = context.surfaceRect();
- var point = context.curtainProjection(locOrBox);
- box = {
- left: point[0] + rect.left,
- top: point[1] + rect.top
+ chips.select("a.remove").attr("href", "#").on("click", removeMultikey).attr("class", "remove").text("\xD7");
+ updateIcon("");
+ } else {
+ var mixedValues = isMixed && tags[field.key].map(function(val) {
+ return displayValue(val);
+ }).filter(Boolean);
+ utilGetSetValue(_input, !isMixed ? displayValue(tags[field.key]) : "").data([tags[field.key]]).classed("raw-value", isRawValue).classed("known-value", isKnownValue).attr("readonly", isReadOnly ? "readonly" : void 0).attr("title", isMixed ? mixedValues.join("\n") : void 0).attr("placeholder", isMixed ? _t("inspector.multiple_values") : _staticPlaceholder || "").classed("mixed", isMixed).on("keydown.deleteCapture", function(d3_event) {
+ if (isReadOnly && isKnownValue(tags[field.key]) && (d3_event.keyCode === utilKeybinding.keyCodes["\u232B"] || d3_event.keyCode === utilKeybinding.keyCodes["\u2326"])) {
+ d3_event.preventDefault();
+ d3_event.stopPropagation();
+ var t2 = {};
+ t2[field.key] = void 0;
+ dispatch14.call("change", this, t2);
+ }
+ });
+ if (!Array.isArray(tags[field.key])) {
+ updateIcon(tags[field.key]);
+ }
+ if (!isMixed) {
+ _lengthIndicator.update(tags[field.key]);
+ }
+ }
+ const refreshStyles = () => {
+ _input.data([tagValue(utilGetSetValue(_input))]).classed("raw-value", isRawValue).classed("known-value", isKnownValue);
};
- } else {
- box = locOrBox;
+ _input.on("input.refreshStyles", refreshStyles);
+ _combobox.on("update.refreshStyles", refreshStyles);
+ refreshStyles();
+ };
+ function registerDragAndDrop(selection2) {
+ var dragOrigin, targetIndex;
+ selection2.call(
+ drag_default().on("start", function(d3_event) {
+ dragOrigin = {
+ x: d3_event.x,
+ y: d3_event.y
+ };
+ targetIndex = null;
+ }).on("drag", function(d3_event) {
+ var x2 = d3_event.x - dragOrigin.x, y2 = d3_event.y - dragOrigin.y;
+ if (!select_default2(this).classed("dragging") && // don't display drag until dragging beyond a distance threshold
+ Math.sqrt(Math.pow(x2, 2) + Math.pow(y2, 2)) <= 5) return;
+ var index = selection2.nodes().indexOf(this);
+ select_default2(this).classed("dragging", true);
+ targetIndex = null;
+ var targetIndexOffsetTop = null;
+ var draggedTagWidth = select_default2(this).node().offsetWidth;
+ if (field.key === "destination" || field.key === "via") {
+ _container.selectAll(".chip").style("transform", function(d2, index2) {
+ var node = select_default2(this).node();
+ if (index === index2) {
+ return "translate(" + x2 + "px, " + y2 + "px)";
+ } else if (index2 > index && d3_event.y > node.offsetTop) {
+ if (targetIndex === null || index2 > targetIndex) {
+ targetIndex = index2;
+ }
+ return "translateY(-100%)";
+ } else if (index2 < index && d3_event.y < node.offsetTop + node.offsetHeight) {
+ if (targetIndex === null || index2 < targetIndex) {
+ targetIndex = index2;
+ }
+ return "translateY(100%)";
+ }
+ return null;
+ });
+ } else {
+ _container.selectAll(".chip").each(function(d2, index2) {
+ var node = select_default2(this).node();
+ if (index !== index2 && d3_event.x < node.offsetLeft + node.offsetWidth + 5 && d3_event.x > node.offsetLeft && d3_event.y < node.offsetTop + node.offsetHeight && d3_event.y > node.offsetTop) {
+ targetIndex = index2;
+ targetIndexOffsetTop = node.offsetTop;
+ }
+ }).style("transform", function(d2, index2) {
+ var node = select_default2(this).node();
+ if (index === index2) {
+ return "translate(" + x2 + "px, " + y2 + "px)";
+ }
+ if (node.offsetTop === targetIndexOffsetTop) {
+ if (index2 < index && index2 >= targetIndex) {
+ return "translateX(" + draggedTagWidth + "px)";
+ } else if (index2 > index && index2 <= targetIndex) {
+ return "translateX(-" + draggedTagWidth + "px)";
+ }
+ }
+ return null;
+ });
+ }
+ }).on("end", function() {
+ if (!select_default2(this).classed("dragging")) {
+ return;
+ }
+ var index = selection2.nodes().indexOf(this);
+ select_default2(this).classed("dragging", false);
+ _container.selectAll(".chip").style("transform", null);
+ if (typeof targetIndex === "number") {
+ var element = _multiData[index];
+ _multiData.splice(index, 1);
+ _multiData.splice(targetIndex, 0, element);
+ var t2 = {};
+ if (_multiData.length) {
+ t2[field.key] = _multiData.map(function(element2) {
+ return element2.key;
+ }).join(";");
+ } else {
+ t2[field.key] = void 0;
+ }
+ dispatch14.call("change", this, t2);
+ }
+ dragOrigin = void 0;
+ targetIndex = void 0;
+ })
+ );
}
- return {
- left: box.left - padding,
- top: box.top - padding,
- width: (box.width || 0) + 2 * padding,
- height: (box.width || 0) + 2 * padding
+ combo.focus = function() {
+ _input.node().focus();
};
+ combo.entityIDs = function(val) {
+ if (!arguments.length) return _entityIDs;
+ _entityIDs = val;
+ return combo;
+ };
+ function combinedEntityExtent() {
+ return _entityIDs && _entityIDs.length && utilTotalExtent(_entityIDs, context.graph());
+ }
+ return utilRebind(combo, dispatch14, "on");
}
- function icon(name2, svgklass, useklass) {
- return '";
- }
- var helpStringReplacements;
- function helpHtml(id2, replacements) {
- if (!helpStringReplacements) {
- helpStringReplacements = {
- point_icon: icon("#iD-icon-point", "inline"),
- line_icon: icon("#iD-icon-line", "inline"),
- area_icon: icon("#iD-icon-area", "inline"),
- note_icon: icon("#iD-icon-note", "inline add-note"),
- plus: icon("#iD-icon-plus", "inline"),
- minus: icon("#iD-icon-minus", "inline"),
- layers_icon: icon("#iD-icon-layers", "inline"),
- data_icon: icon("#iD-icon-data", "inline"),
- inspect: icon("#iD-icon-inspect", "inline"),
- help_icon: icon("#iD-icon-help", "inline"),
- undo_icon: icon(_mainLocalizer.textDirection() === "rtl" ? "#iD-icon-redo" : "#iD-icon-undo", "inline"),
- redo_icon: icon(_mainLocalizer.textDirection() === "rtl" ? "#iD-icon-undo" : "#iD-icon-redo", "inline"),
- save_icon: icon("#iD-icon-save", "inline"),
- circularize_icon: icon("#iD-operation-circularize", "inline operation"),
- continue_icon: icon("#iD-operation-continue", "inline operation"),
- copy_icon: icon("#iD-operation-copy", "inline operation"),
- delete_icon: icon("#iD-operation-delete", "inline operation"),
- disconnect_icon: icon("#iD-operation-disconnect", "inline operation"),
- downgrade_icon: icon("#iD-operation-downgrade", "inline operation"),
- extract_icon: icon("#iD-operation-extract", "inline operation"),
- merge_icon: icon("#iD-operation-merge", "inline operation"),
- move_icon: icon("#iD-operation-move", "inline operation"),
- orthogonalize_icon: icon("#iD-operation-orthogonalize", "inline operation"),
- paste_icon: icon("#iD-operation-paste", "inline operation"),
- reflect_long_icon: icon("#iD-operation-reflect-long", "inline operation"),
- reflect_short_icon: icon("#iD-operation-reflect-short", "inline operation"),
- reverse_icon: icon("#iD-operation-reverse", "inline operation"),
- rotate_icon: icon("#iD-operation-rotate", "inline operation"),
- split_icon: icon("#iD-operation-split", "inline operation"),
- straighten_icon: icon("#iD-operation-straighten", "inline operation"),
- leftclick: icon("#iD-walkthrough-mouse-left", "inline operation"),
- rightclick: icon("#iD-walkthrough-mouse-right", "inline operation"),
- mousewheel_icon: icon("#iD-walkthrough-mousewheel", "inline operation"),
- tap_icon: icon("#iD-walkthrough-tap", "inline operation"),
- doubletap_icon: icon("#iD-walkthrough-doubletap", "inline operation"),
- longpress_icon: icon("#iD-walkthrough-longpress", "inline operation"),
- touchdrag_icon: icon("#iD-walkthrough-touchdrag", "inline operation"),
- pinch_icon: icon("#iD-walkthrough-pinch-apart", "inline operation"),
- shift: uiCmd.display("\u21E7"),
- alt: uiCmd.display("\u2325"),
- return: uiCmd.display("\u21B5"),
- esc: _t.html("shortcuts.key.esc"),
- space: _t.html("shortcuts.key.space"),
- add_note_key: _t.html("modes.add_note.key"),
- help_key: _t.html("help.key"),
- shortcuts_key: _t.html("shortcuts.toggle.key"),
- save: _t.html("save.title"),
- undo: _t.html("undo.title"),
- redo: _t.html("redo.title"),
- upload: _t.html("commit.save"),
- point: _t.html("modes.add_point.title"),
- line: _t.html("modes.add_line.title"),
- area: _t.html("modes.add_area.title"),
- note: _t.html("modes.add_note.label"),
- circularize: _t.html("operations.circularize.title"),
- continue: _t.html("operations.continue.title"),
- copy: _t.html("operations.copy.title"),
- delete: _t.html("operations.delete.title"),
- disconnect: _t.html("operations.disconnect.title"),
- downgrade: _t.html("operations.downgrade.title"),
- extract: _t.html("operations.extract.title"),
- merge: _t.html("operations.merge.title"),
- move: _t.html("operations.move.title"),
- orthogonalize: _t.html("operations.orthogonalize.title"),
- paste: _t.html("operations.paste.title"),
- reflect_long: _t.html("operations.reflect.title.long"),
- reflect_short: _t.html("operations.reflect.title.short"),
- reverse: _t.html("operations.reverse.title"),
- rotate: _t.html("operations.rotate.title"),
- split: _t.html("operations.split.title"),
- straighten: _t.html("operations.straighten.title"),
- map_data: _t.html("map_data.title"),
- osm_notes: _t.html("map_data.layers.notes.title"),
- fields: _t.html("inspector.fields"),
- tags: _t.html("inspector.tags"),
- relations: _t.html("inspector.relations"),
- new_relation: _t.html("inspector.new_relation"),
- turn_restrictions: _t.html("_tagging.presets.fields.restrictions.label"),
- background_settings: _t.html("background.description"),
- imagery_offset: _t.html("background.fix_misalignment"),
- start_the_walkthrough: _t.html("splash.walkthrough"),
- help: _t.html("help.title"),
- ok: _t.html("intro.ok")
- };
- for (var key in helpStringReplacements) {
- helpStringReplacements[key] = { html: helpStringReplacements[key] };
+
+ // modules/ui/account.js
+ function uiAccount(context) {
+ const osm = context.connection();
+ function updateUserDetails(selection2) {
+ if (!osm) return;
+ if (!osm.authenticated()) {
+ render(selection2, null);
+ } else {
+ osm.userDetails((err, user) => render(selection2, user));
}
}
- var reps;
- if (replacements) {
- reps = Object.assign(replacements, helpStringReplacements);
- } else {
- reps = helpStringReplacements;
- }
- return _t.html(id2, reps).replace(/\`(.*?)\`/g, "$1");
- }
- function slugify(text2) {
- return text2.toString().toLowerCase().replace(/\s+/g, "-").replace(/[^\w\-]+/g, "").replace(/\-\-+/g, "-").replace(/^-+/, "").replace(/-+$/, "");
- }
- var missingStrings = {};
- function checkKey(key, text2) {
- if (_t(key, { default: void 0 }) === void 0) {
- if (missingStrings.hasOwnProperty(key))
- return;
- missingStrings[key] = text2;
- var missing = key + ": " + text2;
- if (typeof console !== "undefined")
- console.log(missing);
+ function render(selection2, user) {
+ let userInfo = selection2.select(".userInfo");
+ let loginLogout = selection2.select(".loginLogout");
+ if (user) {
+ userInfo.html("").classed("hide", false);
+ let userLink = userInfo.append("a").attr("href", osm.userURL(user.display_name)).attr("target", "_blank");
+ if (user.image_url) {
+ userLink.append("img").attr("class", "icon pre-text user-icon").attr("src", user.image_url);
+ } else {
+ userLink.call(svgIcon("#iD-icon-avatar", "pre-text light"));
+ }
+ userLink.append("span").attr("class", "label").text(user.display_name);
+ loginLogout.classed("hide", false).select("a").text(_t("logout")).on("click", (e3) => {
+ e3.preventDefault();
+ osm.logout();
+ osm.authenticate(void 0, { switchUser: true });
+ });
+ } else {
+ userInfo.html("").classed("hide", true);
+ loginLogout.classed("hide", false).select("a").text(_t("login")).on("click", (e3) => {
+ e3.preventDefault();
+ osm.authenticate();
+ });
+ }
}
+ return function(selection2) {
+ if (!osm) return;
+ selection2.append("li").attr("class", "userInfo").classed("hide", true);
+ selection2.append("li").attr("class", "loginLogout").classed("hide", true).append("a").attr("href", "#");
+ osm.on("change.account", () => updateUserDetails(selection2));
+ updateUserDetails(selection2);
+ };
}
- function localize(obj) {
- var key;
- var name2 = obj.tags && obj.tags.name;
- if (name2) {
- key = "intro.graph.name." + slugify(name2);
- obj.tags.name = _t(key, { default: name2 });
- checkKey(key, name2);
- }
- var street = obj.tags && obj.tags["addr:street"];
- if (street) {
- key = "intro.graph.name." + slugify(street);
- obj.tags["addr:street"] = _t(key, { default: street });
- checkKey(key, street);
- var addrTags = [
- "block_number",
- "city",
- "county",
- "district",
- "hamlet",
- "neighbourhood",
- "postcode",
- "province",
- "quarter",
- "state",
- "subdistrict",
- "suburb"
- ];
- addrTags.forEach(function(k) {
- var key2 = "intro.graph." + k;
- var tag = "addr:" + k;
- var val = obj.tags && obj.tags[tag];
- var str2 = _t(key2, { default: val });
- if (str2) {
- if (str2.match(/^<.*>$/) !== null) {
- delete obj.tags[tag];
- } else {
- obj.tags[tag] = str2;
- }
+
+ // modules/ui/attribution.js
+ function uiAttribution(context) {
+ let _selection = select_default2(null);
+ function render(selection2, data, klass) {
+ let div = selection2.selectAll(".".concat(klass)).data([0]);
+ div = div.enter().append("div").attr("class", klass).merge(div);
+ let attributions = div.selectAll(".attribution").data(data, (d2) => d2.id);
+ attributions.exit().remove();
+ attributions = attributions.enter().append("span").attr("class", "attribution").each((d2, i3, nodes) => {
+ let attribution = select_default2(nodes[i3]);
+ if (d2.terms_html) {
+ attribution.html(d2.terms_html);
+ return;
+ }
+ if (d2.terms_url) {
+ attribution = attribution.append("a").attr("href", d2.terms_url).attr("target", "_blank");
}
+ const sourceID = d2.id.replace(/\./g, "");
+ const terms_text = _t(
+ "imagery.".concat(sourceID, ".attribution.text"),
+ { default: d2.terms_text || d2.id || d2.name() }
+ );
+ if (d2.icon && !d2.overlay) {
+ attribution.append("img").attr("class", "source-image").attr("src", d2.icon);
+ }
+ attribution.append("span").attr("class", "attribution-text").text(terms_text);
+ }).merge(attributions);
+ let copyright = attributions.selectAll(".copyright-notice").data((d2) => {
+ let notice = d2.copyrightNotices(context.map().zoom(), context.map().extent());
+ return notice ? [notice] : [];
});
+ copyright.exit().remove();
+ copyright = copyright.enter().append("span").attr("class", "copyright-notice").merge(copyright);
+ copyright.text(String);
}
- return obj;
- }
- function isMostlySquare(points) {
- var threshold = 15;
- var lowerBound = Math.cos((90 - threshold) * Math.PI / 180);
- var upperBound = Math.cos(threshold * Math.PI / 180);
- for (var i2 = 0; i2 < points.length; i2++) {
- var a = points[(i2 - 1 + points.length) % points.length];
- var origin = points[i2];
- var b = points[(i2 + 1) % points.length];
- var dotp = geoVecNormalizedDot(a, b, origin);
- var mag = Math.abs(dotp);
- if (mag > lowerBound && mag < upperBound) {
- return false;
- }
+ function update() {
+ let baselayer = context.background().baseLayerSource();
+ _selection.call(render, baselayer ? [baselayer] : [], "base-layer-attribution");
+ const z2 = context.map().zoom();
+ let overlays = context.background().overlayLayerSources() || [];
+ _selection.call(render, overlays.filter((s2) => s2.validZoom(z2)), "overlay-layer-attribution");
}
- return true;
- }
- function selectMenuItem(context, operation) {
- return context.container().select(".edit-menu .edit-menu-item-" + operation);
+ return function(selection2) {
+ _selection = selection2;
+ context.background().on("change.attribution", update);
+ context.map().on("move.attribution", throttle_default(update, 400, { leading: false }));
+ update();
+ };
}
- function transitionTime(point1, point2) {
- var distance = geoSphericalDistance(point1, point2);
- if (distance === 0) {
- return 0;
- } else if (distance < 80) {
- return 500;
- } else {
- return 1e3;
+
+ // modules/ui/contributors.js
+ function uiContributors(context) {
+ var osm = context.connection(), debouncedUpdate = debounce_default(function() {
+ update();
+ }, 1e3), limit = 4, hidden = false, wrap2 = select_default2(null);
+ function update() {
+ if (!osm) return;
+ var users = {}, entities = context.history().intersects(context.map().extent());
+ entities.forEach(function(entity) {
+ if (entity && entity.user) users[entity.user] = true;
+ });
+ var u2 = Object.keys(users), subset = u2.slice(0, u2.length > limit ? limit - 1 : limit);
+ wrap2.html("").call(svgIcon("#iD-icon-nearby", "pre-text light"));
+ var userList = select_default2(document.createElement("span"));
+ userList.selectAll().data(subset).enter().append("a").attr("class", "user-link").attr("href", function(d2) {
+ return osm.userURL(d2);
+ }).attr("target", "_blank").text(String);
+ if (u2.length > limit) {
+ var count = select_default2(document.createElement("span"));
+ var othersNum = u2.length - limit + 1;
+ count.append("a").attr("target", "_blank").attr("href", function() {
+ return osm.changesetsURL(context.map().center(), context.map().zoom());
+ }).text(othersNum);
+ wrap2.append("span").html(_t.html("contributors.truncated_list", { n: othersNum, users: { html: userList.html() }, count: { html: count.html() } }));
+ } else {
+ wrap2.append("span").html(_t.html("contributors.list", { users: { html: userList.html() } }));
+ }
+ if (!u2.length) {
+ hidden = true;
+ wrap2.transition().style("opacity", 0);
+ } else if (hidden) {
+ wrap2.transition().style("opacity", 1);
+ }
}
- }
-
- // 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);
- });
+ if (!osm) return;
+ wrap2 = selection2;
+ update();
+ osm.on("loaded.contributors", debouncedUpdate);
+ context.map().on("move.contributors", debouncedUpdate);
};
}
- // 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());
- }
- }
- curtain.reveal = function(box, html2, options2) {
- options2 = options2 || {};
- if (typeof box === "string") {
- box = select_default2(box).node();
- }
- if (box && box.getBoundingClientRect) {
- box = copyBox(box.getBoundingClientRect());
- var containerRect = containerNode.getBoundingClientRect();
- box.top -= containerRect.top;
- box.left -= containerRect.left;
+ // modules/ui/edit_menu.js
+ function uiEditMenu(context) {
+ var dispatch14 = dispatch_default("toggled");
+ var _menu = select_default2(null);
+ var _operations = [];
+ var _anchorLoc = [0, 0];
+ var _anchorLocLonLat = [0, 0];
+ var _triggerType = "";
+ var _vpTopMargin = 85;
+ var _vpBottomMargin = 45;
+ var _vpSideMargin = 35;
+ var _menuTop = false;
+ var _menuHeight;
+ var _menuWidth;
+ var _verticalPadding = 4;
+ var _tooltipWidth = 210;
+ var _menuSideMargin = 10;
+ var _tooltips = [];
+ var editMenu = function(selection2) {
+ var isTouchMenu = _triggerType.includes("touch") || _triggerType.includes("pen");
+ var ops = _operations.filter(function(op) {
+ return !isTouchMenu || !op.mouseOnly;
+ });
+ if (!ops.length) return;
+ _tooltips = [];
+ _menuTop = isTouchMenu;
+ var showLabels = isTouchMenu;
+ var buttonHeight = showLabels ? 32 : 34;
+ if (showLabels) {
+ _menuWidth = 52 + Math.min(120, 6 * Math.max.apply(Math, ops.map(function(op) {
+ return op.title.length;
+ })));
+ } else {
+ _menuWidth = 44;
}
- 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;
+ _menuHeight = _verticalPadding * 2 + ops.length * buttonHeight;
+ _menu = selection2.append("div").attr("class", "edit-menu").classed("touch-menu", isTouchMenu).style("padding", _verticalPadding + "px 0");
+ var buttons = _menu.selectAll(".edit-menu-item").data(ops);
+ var buttonsEnter = buttons.enter().append("button").attr("class", function(d2) {
+ return "edit-menu-item edit-menu-item-" + d2.id;
+ }).style("height", buttonHeight + "px").on("click", click).on("pointerup", pointerup).on("pointerdown mousedown", function pointerdown(d3_event) {
+ d3_event.stopPropagation();
+ }).on("mouseenter.highlight", function(d3_event, d2) {
+ if (!d2.relatedEntityIds || select_default2(this).classed("disabled")) return;
+ utilHighlightEntities(d2.relatedEntityIds(), true, context);
+ }).on("mouseleave.highlight", function(d3_event, d2) {
+ if (!d2.relatedEntityIds) return;
+ utilHighlightEntities(d2.relatedEntityIds(), false, context);
+ });
+ buttonsEnter.each(function(d2) {
+ var tooltip = uiTooltip().heading(() => d2.title).title(d2.tooltip).keys([d2.keys[0]]);
+ _tooltips.push(tooltip);
+ select_default2(this).call(tooltip).append("div").attr("class", "icon-wrap").call(svgIcon(d2.icon && d2.icon() || "#iD-operation-" + d2.id, "operation"));
+ });
+ if (showLabels) {
+ buttonsEnter.append("span").attr("class", "label").each(function(d2) {
+ select_default2(this).call(d2.title);
+ });
}
- 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());
+ buttonsEnter.merge(buttons).classed("disabled", function(d2) {
+ return d2.disabled();
+ });
+ updatePosition();
+ var initialScale = context.projection.scale();
+ context.map().on("move.edit-menu", function() {
+ if (initialScale !== context.projection.scale()) {
+ editMenu.close();
}
- } else {
- tooltipBox = box;
+ }).on("drawn.edit-menu", function(info) {
+ if (info.full) updatePosition();
+ });
+ var lastPointerUpType;
+ function pointerup(d3_event) {
+ lastPointerUpType = d3_event.pointerType;
}
- if (tooltipBox && html2) {
- if (html2.indexOf("**") !== -1) {
- if (html2.indexOf(")(.+?)(\*\*)/, "$1$2$3");
- } else {
- html2 = html2.replace(/^(.+?)(\*\*)/, "$1$2");
- }
- html2 = html2.replace(/\*\*(.*?)\*\*/g, '$1');
- }
- html2 = html2.replace(/\*(.*?)\*/g, "$1");
- html2 = html2.replace(/\{br\}/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();
- });
+ function click(d3_event, operation2) {
+ d3_event.stopPropagation();
+ if (operation2.relatedEntityIds) {
+ utilHighlightEntities(operation2.relatedEntityIds(), false, context);
}
- 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 (operation2.disabled()) {
+ if (lastPointerUpType === "touch" || lastPointerUpType === "pen") {
+ context.ui().flash.duration(4e3).iconName("#iD-operation-" + operation2.id).iconClass("operation disabled").label(operation2.tooltip())();
+ }
+ } 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();
}
- if (tooltipBox.top + tooltipBox.height > h) {
- tooltipBox.height -= tooltipBox.top + tooltipBox.height - h;
+ lastPointerUpType = null;
+ }
+ dispatch14.call("toggled", this, true);
+ };
+ 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;
+ }
+ 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;
}
- if (tooltipBox.left + tooltipBox.width > w) {
- tooltipBox.width -= tooltipBox.left + tooltipBox.width - w;
+ } else {
+ if (anchorLoc[1] + _menuHeight > viewport.height - _vpBottomMargin) {
+ offset[1] = -anchorLoc[1] - _menuHeight + viewport.height - _vpBottomMargin;
+ } else {
+ offset[1] = 0;
}
- 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
- ];
+ }
+ var origin = geoVecAdd(anchorLoc, offset);
+ var _verticalOffset = parseFloat(utilGetDimensions(select_default2(".top-toolbar-wrap"))[1]);
+ origin[1] -= _verticalOffset;
+ _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 {
- 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 (anchorLoc[0] - _menuSideMargin - _menuWidth < _vpSideMargin) {
+ return false;
}
+ return true;
}
- 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;
+ }
+ 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";
}
- tooltip.selectAll(".popover-inner").style("top", shiftY + "px");
- } else {
- tooltip.classed("in", false).call(uiToggle(false));
}
- curtain.cut(box, options2.duration);
- return tooltip;
+ }
+ editMenu.close = function() {
+ context.map().on("move.edit-menu", null).on("drawn.edit-menu", null);
+ _menu.remove();
+ _tooltips = [];
+ dispatch14.call("toggled", this, false);
};
- 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(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";
- });
+ editMenu.anchorLoc = function(val) {
+ if (!arguments.length) return _anchorLoc;
+ _anchorLoc = val;
+ _anchorLocLonLat = context.projection.invert(_anchorLoc);
+ return editMenu;
};
- curtain.remove = function() {
- surface.remove();
- tooltip.remove();
- select_default2(window).on("resize.curtain", null);
+ editMenu.triggerType = function(val) {
+ if (!arguments.length) return _triggerType;
+ _triggerType = val;
+ return editMenu;
};
- function copyBox(src) {
- return {
- top: src.top,
- right: src.right,
- bottom: src.bottom,
- left: src.left,
- width: src.width,
- height: src.height
- };
+ 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 });
+ function error() {
+ if (_position) {
+ zoomTo();
+ } else {
+ context.ui().flash.label(_t.append("geolocate.location_unavailable")).iconName("#iD-icon-geolocate")();
}
- 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);
- }
+ finish();
+ }
+ function finish() {
+ _locating.close();
+ if (_timeoutID) {
+ clearTimeout(_timeoutID);
+ }
+ _timeoutID = void 0;
+ }
+ 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"))
+ );
+ };
+ }
+
+ // 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]);
+ });
+ 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);
});
- }, msec + 100);
- function continueTo(nextStep) {
- context.map().on("move.intro drawn.intro", null);
- nextStep();
}
- }
- 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);
+ ["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 continueTo(nextStep) {
- context.map().on("move.intro drawn.intro", null);
- nextStep();
- }
}
- function features2() {
- 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(".surface", helpHtml("intro.navigation.features"), { 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 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 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();
- }
- }
- function nodesWays() {
- var onClick = function() {
- continueTo(clickTownHall);
+ };
+ 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"
};
- 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 });
- });
- function continueTo(nextStep) {
- context.map().on("drawn.intro", null);
- nextStep();
- }
+ var d2 = new Date(timestamp);
+ if (isNaN(d2.getTime())) return _t("info_panels.history.unknown");
+ return d2.toLocaleString(_mainLocalizer.localeCode(), options2);
}
- function clickTownHall() {
- context.enter(modeBrowse(context));
- context.history().reset("initial");
- var entity = context.hasEntity(hallId);
- if (!entity)
+ function displayUser(selection2, userName) {
+ if (!userName) {
+ 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();
+ 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 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();
+ function displayChangeset(selection2, changeset) {
+ if (!changeset) {
+ selection2.append("span").call(_t.append("info_panels.history.unknown"));
+ return;
}
- }
- 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();
+ 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 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 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 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();
+ 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 searchStreet() {
- context.enter(modeBrowse(context));
- context.history().reset("initial");
- var msec = transitionTime(springStreet, context.map().center());
- if (msec) {
- reveal(null, null, { duration: 0 });
+ if (!singular) return;
+ if (entity) {
+ selection2.call(redrawEntity, entity);
+ } else if (note) {
+ selection2.call(redrawNote, note);
}
- 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 name2 = _t("intro.graph.name.spring-street");
- if (!firstName.empty() && firstName.html() === name2) {
- reveal(first.node(), helpHtml("intro.navigation.choose_street", { name: name2 }), { 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 redrawNote(selection2, note) {
+ if (!note || note.isNew()) {
+ selection2.append("div").call(_t.append("info_panels.history.note_no_history"));
+ return;
}
- function continueTo(nextStep) {
- context.on("exit.intro", null);
- context.container().select(".search-header input").on("keydown.intro", null).on("keyup.intro", null);
- nextStep();
+ 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);
+ }
+ 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: { html: onewayField.label() },
- field2: { html: maxspeedField.label() }
- }));
- 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: { html: onewayField.label() },
- field2: { html: maxspeedField.label() }
- }), { 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();
+ }
+ }
+ }
+ selection2.html("");
+ if (heading2) {
+ selection2.append("h4").attr("class", "measurement-heading").html(heading2);
+ }
+ 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 placePoint() {
- if (context.mode().id !== "add-point") {
- return chapter.restart();
+ if (totalNodeCount) {
+ list2.append("li").call(_t.append("info_panels.measurement.node_count", { suffix: ":" })).append("span").text(totalNodeCount.toLocaleString(localeCode));
}
- 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();
+ if (area) {
+ list2.append("li").call(_t.append("info_panels.measurement.area", { suffix: ":" })).append("span").text(displayArea(area, _isImperial));
}
- }
- function searchPreset() {
- if (context.mode().id !== "select" || !_pointID || !context.hasEntity(_pointID)) {
- return addPoint();
+ if (length2) {
+ list2.append("li").call(_t.append("info_panels.measurement." + (closed ? "perimeter" : "length"), { suffix: ":" })).append("span").text(displayLength(length2, _isImperial));
}
- 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 (typeof distance === "number") {
+ list2.append("li").call(_t.append("info_panels.measurement.distance", { suffix: ":" })).append("span").text(displayLength(distance, _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 (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));
}
- }
- function aboutFeatureEditor() {
- if (context.mode().id !== "select" || !_pointID || !context.hasEntity(_pointID)) {
- return addPoint();
+ 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));
}
- timeout2(function() {
- reveal(".entity-editor-pane", helpHtml("intro.points.feature_editor"), {
- tooltipClass: "intro-points-describe",
- buttonText: _t.html("intro.ok"),
- buttonCallback: function() {
- continueTo(addName);
- }
+ 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);
});
- }, 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();
+ 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;
}
- 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");
+ });
+ 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 {
- reveal(".entity-editor-pane", addNameString, { tooltipClass: "intro-points-describe" });
+ if (activeids.length) {
+ wasActive = activeids;
+ activeids.forEach(function(k2) {
+ active[k2] = false;
+ });
+ } else {
+ wasActive.forEach(function(k2) {
+ active[k2] = true;
+ });
+ }
}
- }, 400);
- context.history().on("change.intro", function() {
- continueTo(addCloseEditor);
+ 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();
});
- context.on("exit.intro", function() {
- continueTo(reselectPoint);
+ 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);
+ });
});
- 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);
+ 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);
});
- reveal(".entity-editor-pane", helpHtml("intro.points.add_close", { button: { html: icon(href, "inline") } }));
- function continueTo(nextStep) {
- context.on("exit.intro", null);
- nextStep();
+ };
+ }
+
+ // 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 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();
+ curtain.reveal = function(box, html3, options2) {
+ options2 = options2 || {};
+ if (typeof box === "string") {
+ box = select_default2(box).node();
}
- }
- function updatePoint() {
- if (context.mode().id !== "select" || !_pointID || !context.hasEntity(_pointID)) {
- return continueTo(reselectPoint);
+ if (box && box.getBoundingClientRect) {
+ box = copyBox(box.getBoundingClientRect());
}
- 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();
+ if (box) {
+ var containerRect = containerNode.getBoundingClientRect();
+ box.top -= containerRect.top;
+ box.left -= containerRect.left;
}
- }
- function updateCloseEditor() {
- if (context.mode().id !== "select" || !_pointID || !context.hasEntity(_pointID)) {
- return continueTo(reselectPoint);
+ 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;
}
- 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();
+ 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;
}
- }
- 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();
+ if (tooltipBox && html3) {
+ if (html3.indexOf("**") !== -1) {
+ if (html3.indexOf(")(.+?)(\*\*)/, "$1$2$3");
+ } else {
+ html3 = html3.replace(/^(.+?)(\*\*)/, "$1$2");
+ }
+ html3 = html3.replace(/\*\*(.*?)\*\*/g, '$1');
+ }
+ html3 = html3.replace(/\*(.*?)\*/g, "$1");
+ html3 = html3.replace(/\{br\}/g, "
");
+ 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();
+ });
+ }
+ 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;
+ }
+ const onLeftOrRightEdge = tooltipBox.left + tooltipBox.width / 2 > w2 - 100 || tooltipBox.left + tooltipBox.width / 2 < 100;
+ if (tooltipBox.top + tooltipBox.height < 100 && !onLeftOrRightEdge) {
+ side = "bottom";
+ pos = [
+ tooltipBox.left + tooltipBox.width / 2 - tip.width / 2,
+ tooltipBox.top + tooltipBox.height
+ ];
+ } else if (tooltipBox.top > h2 - 140 && !onLeftOrRightEdge) {
+ 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 > w2 - 70) {
+ side = "left";
+ pos = [tooltipBox.left - tooltipWidth - tooltipArrow, tipY];
+ } else {
+ side = "right";
+ pos = [tooltipBox.left + tooltipBox.width + tooltipArrow, tipY];
+ }
+ }
+ }
+ 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 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);
+ 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);
}
- 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);
- }
+ 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";
});
- function continueTo(nextStep) {
- context.map().on("move.intro", null);
- context.history().on("change.intro", null);
- context.on("exit.intro", null);
- nextStep();
- }
+ };
+ 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
+ };
}
- 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();
- }
+ 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(
+ ".intro-nav-wrap .chapter-welcome",
+ helpHtml("intro.welcome.welcome"),
+ { buttonText: _t.html("intro.ok"), buttonCallback: practice }
+ );
}
- function play() {
- dispatch10.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");
- }
- });
+ 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() {
- addPoint();
+ welcome();
};
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(".curtain-tooltip.intro-mouse").selectAll(".counter").remove();
};
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/navigation.js
+ function uiIntroNavigation(context, reveal) {
+ var dispatch14 = dispatch_default("done");
var timeouts = [];
- var _areaID;
+ 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.areas.title"
+ title: "intro.navigation.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 isTownHallSelected() {
+ var ids = context.selectedIDs();
+ return ids.length === 1 && ids[0] === hallId;
}
- function addArea() {
+ function dragMap() {
context.enter(modeBrowse(context));
context.history().reset("initial");
- _areaID = null;
- var msec = transitionTime(playground, context.map().center());
+ var msec = transitionTime(townHall, context.map().center());
if (msec) {
reveal(null, null, { duration: 0 });
}
- context.map().centerZoomEase(playground, 19, msec);
+ context.map().centerZoomEase(townHall, 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);
+ 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(".main-map .surface", dragString);
+ context.map().on("drawn.intro", function() {
+ reveal(".main-map .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.on("enter.intro", null);
+ context.map().on("move.intro drawn.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 zoomMap() {
+ var zoomStart = context.map().zoom();
+ var textId = context.lastPointerType() === "mouse" ? "zoom" : "zoom_touch";
+ var zoomString = helpHtml("intro.navigation." + textId);
+ reveal(".main-map .surface", zoomString);
+ context.map().on("drawn.intro", function() {
+ reveal(".main-map .surface", zoomString, { duration: 0 });
+ });
+ context.map().on("move.intro", function() {
+ if (context.map().zoom() !== zoomStart) {
+ context.map().on("move.intro", null);
+ timeout2(function() {
+ continueTo(features);
+ }, 3e3);
+ }
+ });
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 features() {
+ var onClick = function() {
+ continueTo(pointsLinesAreas);
+ };
+ reveal(
+ ".main-map .surface",
+ helpHtml("intro.navigation.features"),
+ { buttonText: _t.html("intro.ok"), buttonCallback: onClick }
+ );
+ context.map().on("drawn.intro", function() {
+ reveal(
+ ".main-map .surface",
+ helpHtml("intro.navigation.features"),
+ { duration: 0, buttonText: _t.html("intro.ok"), buttonCallback: onClick }
+ );
+ });
+ function continueTo(nextStep) {
+ context.map().on("drawn.intro", null);
+ nextStep();
}
- _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 pointsLinesAreas() {
+ var onClick = function() {
+ continueTo(nodesWays);
+ };
+ reveal(
+ ".main-map .surface",
+ helpHtml("intro.navigation.points_lines_areas"),
+ { buttonText: _t.html("intro.ok"), buttonCallback: onClick }
+ );
+ context.map().on("drawn.intro", function() {
+ reveal(
+ ".main-map .surface",
+ helpHtml("intro.navigation.points_lines_areas"),
+ { duration: 0, buttonText: _t.html("intro.ok"), buttonCallback: onClick }
+ );
});
function continueTo(nextStep) {
- context.map().on("move.intro drawn.intro", null);
- context.on("enter.intro", null);
+ context.map().on("drawn.intro", null);
nextStep();
}
}
- function finishPlayground() {
- if (context.mode().id !== "draw-area") {
- return chapter.restart();
+ function nodesWays() {
+ var onClick = function() {
+ continueTo(clickTownHall);
+ };
+ reveal(
+ ".main-map .surface",
+ helpHtml("intro.navigation.nodes_ways"),
+ { buttonText: _t.html("intro.ok"), buttonCallback: onClick }
+ );
+ context.map().on("drawn.intro", function() {
+ reveal(
+ ".main-map .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();
}
- _areaID = null;
- var finishString = helpHtml("intro.areas.finish_area_" + (context.lastPointerType() === "mouse" ? "click" : "tap")) + helpHtml("intro.areas.finish_playground");
- revealPlayground(playground, finishString, { duration: 250 });
+ }
+ 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() {
+ 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() {
- revealPlayground(playground, finishString, { duration: 0 });
+ var entity3 = context.hasEntity(hallId);
+ if (!entity3) return;
+ var box2 = pointBox(entity3.loc, context);
+ reveal(box2, helpHtml("intro.navigation." + textId), { duration: 0 });
});
- }, 250);
- context.on("enter.intro", function(mode) {
- if (mode.id === "draw-area") {
- return;
- } else if (mode.id === "select") {
- _areaID = context.selectedIDs()[0];
- return continueTo(searchPresets);
- } else {
- return chapter.restart();
+ 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.map().on("move.intro drawn.intro", null);
context.on("enter.intro", null);
+ context.map().on("move.intro drawn.intro", null);
+ context.history().on("change.intro", null);
nextStep();
}
}
- function searchPresets() {
- if (!_areaID || !context.hasEntity(_areaID)) {
- return addArea();
- }
- var ids = context.selectedIDs();
- if (context.mode().id !== "select" || !ids.length || ids[0] !== _areaID) {
- context.enter(modeSelect(context, [_areaID]));
- }
- context.container().select(".inspector-wrap").on("wheel.intro", eventCancel);
- timeout2(function() {
- context.container().select(".inspector-wrap .panewrap").style("right", "-100%");
- context.container().select(".preset-search-input").on("keydown.intro", null).on("keyup.intro", checkPresetSearch);
- reveal(".preset-search-input", helpHtml("intro.areas.search_playground", { preset: playgroundPreset.name() }));
- }, 400);
- context.on("enter.intro", function(mode) {
- if (!_areaID || !context.hasEntity(_areaID)) {
- return continueTo(addArea);
- }
- var ids2 = context.selectedIDs();
- if (mode.id !== "select" || !ids2.length || ids2[0] !== _areaID) {
- context.enter(modeSelect(context, [_areaID]));
- context.container().select(".inspector-wrap .panewrap").style("right", "-100%");
- 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.areas.search_playground", { preset: playgroundPreset.name() }));
- context.history().on("change.intro", null);
- }
+ 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 }
+ );
});
- function checkPresetSearch() {
- var first = context.container().select(".preset-list-item:first-child");
- if (first.classed("preset-leisure-playground")) {
- reveal(first.select(".preset-list-button").node(), helpHtml("intro.areas.choose_playground", { preset: playgroundPreset.name() }), { duration: 300 });
- context.container().select(".preset-search-input").on("keydown.intro", eventCancel, true).on("keyup.intro", null);
- context.history().on("change.intro", function() {
- continueTo(clickAddField);
- });
+ context.history().on("change.intro", function() {
+ if (!context.hasEntity(hallId)) {
+ continueTo(clickTownHall);
}
- }
+ });
function continueTo(nextStep) {
- context.container().select(".inspector-wrap").on("wheel.intro", null);
- context.on("enter.intro", null);
+ context.map().on("move.intro drawn.intro", null);
context.history().on("change.intro", null);
- context.container().select(".preset-search-input").on("keydown.intro keyup.intro", null);
nextStep();
}
}
- function clickAddField() {
- if (!_areaID || !context.hasEntity(_areaID)) {
- return addArea();
- }
- var ids = context.selectedIDs();
- if (context.mode().id !== "select" || !ids.length || ids[0] !== _areaID) {
- return searchPresets();
- }
- if (!context.container().select(".form-field-description").empty()) {
- return continueTo(describePlayground);
- }
+ function editorTownHall() {
+ if (!isTownHallSelected()) return clickTownHall();
context.container().select(".inspector-wrap").on("wheel.intro", eventCancel);
- timeout2(function() {
- context.container().select(".inspector-wrap .panewrap").style("right", "0%");
- var entity = context.entity(_areaID);
- if (entity.tags.description) {
- return continueTo(play);
- }
- var box = context.container().select(".more-fields").node().getBoundingClientRect();
- if (box.top > 300) {
- var pane = context.container().select(".entity-editor-pane .inspector-body");
- var start2 = pane.node().scrollTop;
- 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);
- };
- });
- }
- timeout2(function() {
- reveal(".more-fields .combobox-input", helpHtml("intro.areas.add_field", {
- name: { html: nameField.label() },
- description: { html: descriptionField.label() }
- }), { duration: 300 });
- context.container().select(".more-fields .combobox-input").on("click.intro", function() {
- var watcher;
- watcher = window.setInterval(function() {
- if (!context.container().select("div.combobox").empty()) {
- window.clearInterval(watcher);
- continueTo(chooseDescriptionField);
- }
- }, 300);
- });
- }, 300);
- }, 400);
+ 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() {
- return continueTo(searchPresets);
+ continueTo(clickTownHall);
+ });
+ context.history().on("change.intro", function() {
+ if (!context.hasEntity(hallId)) {
+ continueTo(clickTownHall);
+ }
});
function continueTo(nextStep) {
- context.container().select(".inspector-wrap").on("wheel.intro", null);
- context.container().select(".more-fields .combobox-input").on("click.intro", null);
context.on("exit.intro", null);
+ context.history().on("change.intro", null);
+ context.container().select(".inspector-wrap").on("wheel.intro", null);
nextStep();
}
}
- function chooseDescriptionField() {
- if (!_areaID || !context.hasEntity(_areaID)) {
- return addArea();
- }
- var ids = context.selectedIDs();
- if (context.mode().id !== "select" || !ids.length || ids[0] !== _areaID) {
- return searchPresets();
- }
- if (!context.container().select(".form-field-description").empty()) {
- return continueTo(describePlayground);
- }
- if (context.container().select("div.combobox").empty()) {
- return continueTo(clickAddField);
- }
- var watcher;
- watcher = window.setInterval(function() {
- if (context.container().select("div.combobox").empty()) {
- window.clearInterval(watcher);
- timeout2(function() {
- if (context.container().select(".form-field-description").empty()) {
- continueTo(retryChooseDescription);
- } else {
- continueTo(describePlayground);
- }
- }, 300);
- }
- }, 300);
- reveal("div.combobox", helpHtml("intro.areas.choose_field", { field: { html: descriptionField.label() } }), { duration: 300 });
+ 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() {
- return continueTo(searchPresets);
+ continueTo(clickTownHall);
+ });
+ context.history().on("change.intro", function() {
+ if (!context.hasEntity(hallId)) {
+ continueTo(clickTownHall);
+ }
});
function continueTo(nextStep) {
- if (watcher)
- window.clearInterval(watcher);
context.on("exit.intro", null);
+ context.history().on("change.intro", null);
+ context.container().select(".inspector-wrap").on("wheel.intro", null);
nextStep();
}
}
- function describePlayground() {
- if (!_areaID || !context.hasEntity(_areaID)) {
- return addArea();
- }
- var ids = context.selectedIDs();
- if (context.mode().id !== "select" || !ids.length || ids[0] !== _areaID) {
- return searchPresets();
- }
+ function fieldsTownHall() {
+ if (!isTownHallSelected()) return clickTownHall();
context.container().select(".inspector-wrap .panewrap").style("right", "0%");
- if (context.container().select(".form-field-description").empty()) {
- return continueTo(retryChooseDescription);
+ 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();
}
+ }
+ 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(play);
+ 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 }
+ );
});
- reveal(".entity-editor-pane", helpHtml("intro.areas.describe_playground", { button: { html: icon("#iD-icon-close", "inline") } }), { duration: 300 });
function continueTo(nextStep) {
context.on("exit.intro", null);
+ context.history().on("change.intro", null);
nextStep();
}
}
- function retryChooseDescription() {
- if (!_areaID || !context.hasEntity(_areaID)) {
- return addArea();
+ function searchStreet() {
+ context.enter(modeBrowse(context));
+ context.history().reset("initial");
+ var msec = transitionTime(springStreet, context.map().center());
+ if (msec) {
+ reveal(null, null, { duration: 0 });
}
- var ids = context.selectedIDs();
- if (context.mode().id !== "select" || !ids.length || ids[0] !== _areaID) {
- return searchPresets();
+ 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);
}
- context.container().select(".inspector-wrap .panewrap").style("right", "0%");
- reveal(".entity-editor-pane", helpHtml("intro.areas.retry_add_field", { field: { html: descriptionField.label() } }), {
- buttonText: _t.html("intro.ok"),
- buttonCallback: function() {
- continueTo(clickAddField);
+ 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() {
- return continueTo(searchPresets);
+ 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");
- reveal(".ideditor", helpHtml("intro.areas.play", { next: _t("intro.lines.title") }), {
- tooltipBox: ".intro-nav-wrap .chapter-line",
- buttonText: _t.html("intro.ok"),
- buttonCallback: function() {
- reveal(".ideditor");
+ dispatch14.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");
+ }
}
- });
+ );
}
chapter.enter = function() {
- addArea();
+ dragMap();
};
chapter.exit = function() {
timeouts.forEach(window.clearTimeout);
@@ -53562,851 +57863,863 @@ ${content}
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(".preset-search-input").on("keydown.intro keyup.intro", null);
- context.container().select(".more-fields .combobox-input").on("click.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/line.js
- function uiIntroLine(context, reveal) {
- var dispatch10 = dispatch_default("done");
+ // modules/ui/intro/point.js
+ function uiIntroPoint(context, reveal) {
+ var dispatch14 = dispatch_default("done");
var timeouts = [];
- var _tulipRoadID = null;
- var flowerRoadID = "w646";
- var tulipRoadStart = [-85.6297754121684, 41.95805253325314];
- var tulipRoadMidpoint = [-85.62975395449628, 41.95787501510204];
- var tulipRoadIntersection = [-85.62974496187628, 41.95742515554585];
- var roadCategory = _mainPresetIndex.item("category-road_minor");
- var residentialPreset = _mainPresetIndex.item("highway/residential");
- var woodRoadID = "w525";
- var woodRoadEndID = "n2862";
- var woodRoadAddNode = [-85.62390110349587, 41.95397111462291];
- var woodRoadDragEndpoint = [-85.623867390213, 41.95466987786487];
- var woodRoadDragMidpoint = [-85.62386254803509, 41.95430395953872];
- var washingtonStreetID = "w522";
- var twelfthAvenueID = "w1";
- var eleventhAvenueEndID = "n3550";
- var twelfthAvenueEndID = "n5";
- var _washingtonSegmentID = null;
- var eleventhAvenueEnd = context.entity(eleventhAvenueEndID).loc;
- var twelfthAvenueEnd = context.entity(twelfthAvenueEndID).loc;
- var deleteLinesLoc = [-85.6219395542764, 41.95228033922477];
- var twelfthAvenue = [-85.62219310052491, 41.952505413152956];
+ 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.lines.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 addLine() {
+ function addPoint() {
context.enter(modeBrowse(context));
context.history().reset("initial");
- var msec = transitionTime(tulipRoadStart, context.map().center());
+ var msec = transitionTime(intersection2, context.map().center());
if (msec) {
reveal(null, null, { duration: 0 });
}
- context.map().centerZoomEase(tulipRoadStart, 18.5, msec);
- timeout2(function() {
- var tooltip = reveal("button.add-line", helpHtml("intro.lines.add_line"));
- 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;
- continueTo(startLine);
- });
- }, msec + 100);
- function continueTo(nextStep) {
- context.on("enter.intro", null);
- nextStep();
- }
- }
- function startLine() {
- 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);
- box.height = box.height + 100;
- var textId = context.lastPointerType() === "mouse" ? "start_line" : "start_line_tap";
- var startLineString = helpHtml("intro.lines.missing_road") + "{br}" + helpHtml("intro.lines.line_draw_info") + helpHtml("intro.lines." + textId);
- reveal(box, startLineString);
- context.map().on("move.intro drawn.intro", function() {
- padding = 70 * Math.pow(2, context.map().zoom() - 18);
- box = pad(tulipRoadStart, padding, context);
- box.height = box.height + 100;
- reveal(box, startLineString, { duration: 0 });
- });
- context.on("enter.intro", function(mode) {
- if (mode.id !== "draw-line")
- return chapter.restart();
- continueTo(drawLine);
- });
- function continueTo(nextStep) {
- context.map().on("move.intro drawn.intro", null);
- context.on("enter.intro", null);
- nextStep();
- }
- }
- function drawLine() {
- if (context.mode().id !== "draw-line")
- return chapter.restart();
- _tulipRoadID = context.mode().selectedIDs()[0];
- context.map().centerEase(tulipRoadMidpoint, 500);
+ context.map().centerZoomEase(intersection2, 19, msec);
timeout2(function() {
- var padding = 200 * Math.pow(2, context.map().zoom() - 18.5);
- var box = pad(tulipRoadMidpoint, padding, context);
- box.height = box.height * 2;
- reveal(box, helpHtml("intro.lines.intersect", { name: _t("intro.graph.name.flower-street") }));
- context.map().on("move.intro drawn.intro", function() {
- padding = 200 * Math.pow(2, context.map().zoom() - 18.5);
- box = pad(tulipRoadMidpoint, padding, context);
- box.height = box.height * 2;
- reveal(box, helpHtml("intro.lines.intersect", { name: _t("intro.graph.name.flower-street") }), { duration: 0 });
+ 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);
});
- }, 550);
- context.history().on("change.intro", function() {
- if (isLineConnected()) {
- continueTo(continueLine);
- }
+ }, msec + 100);
+ function continueTo(nextStep) {
+ context.on("enter.intro", null);
+ nextStep();
+ }
+ }
+ function placePoint() {
+ if (context.mode().id !== "add-point") {
+ return chapter.restart();
+ }
+ 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 === "draw-line") {
- return;
- } else if (mode.id === "select") {
- continueTo(retryIntersect);
- return;
+ 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();
+ }
+ });
} else {
- return chapter.restart();
+ continueTo(searchPreset);
}
});
function continueTo(nextStep) {
context.map().on("move.intro drawn.intro", null);
- context.history().on("change.intro", null);
context.on("enter.intro", null);
nextStep();
}
}
- function isLineConnected() {
- var entity = _tulipRoadID && context.hasEntity(_tulipRoadID);
- if (!entity)
- return false;
- var drawNodes = context.graph().childNodes(entity);
- return drawNodes.some(function(node) {
- return context.graph().parentWays(node).some(function(parent) {
- return parent.id === flowerRoadID;
- });
- });
- }
- function retryIntersect() {
- select_default2(window).on("pointerdown.intro mousedown.intro", eventCancel, true);
- var box = pad(tulipRoadIntersection, 80, context);
- reveal(box, helpHtml("intro.lines.retry_intersect", { name: _t("intro.graph.name.flower-street") }));
- timeout2(chapter.restart, 3e3);
- }
- function continueLine() {
- if (context.mode().id !== "draw-line")
- return chapter.restart();
- var entity = _tulipRoadID && context.hasEntity(_tulipRoadID);
- 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);
+ function searchPreset() {
+ if (context.mode().id !== "select" || !_pointID || !context.hasEntity(_pointID)) {
+ return addPoint();
+ }
+ 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 (mode.id === "draw-line") {
- return;
- } else if (mode.id === "select") {
- return continueTo(chooseCategoryRoad);
- } 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.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 chooseCategoryRoad() {
- 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();
- context.container().select(".inspector-wrap").on("wheel.intro", eventCancel);
+ function aboutFeatureEditor() {
+ if (context.mode().id !== "select" || !_pointID || !context.hasEntity(_pointID)) {
+ return addPoint();
+ }
timeout2(function() {
- context.container().select(".inspector-wrap .panewrap").style("right", "-100%");
- reveal(button.node(), helpHtml("intro.lines.choose_category_road", { category: roadCategory.name() }));
- button.on("click.intro", function() {
- continueTo(choosePresetResidential);
+ reveal(".entity-editor-pane", helpHtml("intro.points.feature_editor"), {
+ tooltipClass: "intro-points-describe",
+ buttonText: _t.html("intro.ok"),
+ buttonCallback: function() {
+ continueTo(addName);
+ }
});
}, 400);
- function continueTo(nextStep) {
- context.container().select(".inspector-wrap").on("wheel.intro", null);
- context.container().select(".preset-list-button").on("click.intro", null);
- context.on("exit.intro", null);
- nextStep();
- }
- }
- function choosePresetResidential() {
- 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();
- subgrid.selectAll(":not(.preset-highway-residential) .preset-list-button").on("click.intro", function() {
- continueTo(retryPresetResidential);
- });
- subgrid.selectAll(".preset-highway-residential .preset-list-button").on("click.intro", function() {
- continueTo(nameRoad);
+ continueTo(reselectPoint);
});
- timeout2(function() {
- reveal(subgrid.node(), helpHtml("intro.lines.choose_preset_residential", { preset: residentialPreset.name() }), { tooltipBox: ".preset-highway-residential .preset-list-button", duration: 300 });
- }, 300);
function continueTo(nextStep) {
- context.container().select(".preset-list-button").on("click.intro", null);
context.on("exit.intro", null);
nextStep();
}
}
- function retryPresetResidential() {
- if (context.mode().id !== "select")
- return chapter.restart();
+ 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") + "{br}" + helpHtml("intro.points.add_reminder");
+ 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() {
- return chapter.restart();
+ continueTo(reselectPoint);
});
- context.container().select(".inspector-wrap").on("wheel.intro", eventCancel);
- timeout2(function() {
- var button = context.container().select(".entity-editor-pane .preset-list-button");
- reveal(button.node(), helpHtml("intro.lines.retry_preset_residential", { preset: residentialPreset.name() }));
- button.on("click.intro", function() {
- continueTo(chooseCategoryRoad);
- });
- }, 500);
function continueTo(nextStep) {
- context.container().select(".inspector-wrap").on("wheel.intro", null);
- context.container().select(".preset-list-button").on("click.intro", null);
context.on("exit.intro", null);
+ context.history().on("change.intro", null);
nextStep();
}
}
- function nameRoad() {
+ 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(didNameRoad);
+ continueTo(reselectPoint);
});
- timeout2(function() {
- reveal(".entity-editor-pane", helpHtml("intro.lines.name_road", { button: { html: icon("#iD-icon-close", "inline") } }), { tooltipClass: "intro-lines-name_road" });
- }, 500);
+ reveal(
+ ".entity-editor-pane",
+ helpHtml("intro.points.add_close", { button: { html: icon(href, "inline") } })
+ );
function continueTo(nextStep) {
context.on("exit.intro", null);
nextStep();
}
}
- function didNameRoad() {
- context.history().checkpoint("doneAddLine");
- timeout2(function() {
- reveal(".surface", helpHtml("intro.lines.did_name_road"), {
- buttonText: _t.html("intro.ok"),
- buttonCallback: function() {
- continueTo(updateLine);
- }
- });
- }, 500);
- function continueTo(nextStep) {
- nextStep();
- }
- }
- function updateLine() {
- context.history().reset("doneAddLine");
- if (!context.hasEntity(woodRoadID) || !context.hasEntity(woodRoadEndID)) {
- return chapter.restart();
- }
- var msec = transitionTime(woodRoadDragMidpoint, context.map().center());
+ 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().centerZoomEase(woodRoadDragMidpoint, 19, msec);
+ context.map().centerEase(entity.loc, msec);
timeout2(function() {
- var padding = 250 * Math.pow(2, context.map().zoom() - 19);
- var box = pad(woodRoadDragMidpoint, padding, context);
- var advance = function() {
- continueTo(addNode);
- };
- reveal(box, helpHtml("intro.lines.update_line"), { buttonText: _t.html("intro.ok"), buttonCallback: advance });
- context.map().on("move.intro drawn.intro", function() {
- var padding2 = 250 * Math.pow(2, context.map().zoom() - 19);
- var box2 = pad(woodRoadDragMidpoint, padding2, context);
- reveal(box2, helpHtml("intro.lines.update_line"), { duration: 0, buttonText: _t.html("intro.ok"), buttonCallback: advance });
+ 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 addNode() {
- context.history().reset("doneAddLine");
- if (!context.hasEntity(woodRoadID) || !context.hasEntity(woodRoadEndID)) {
- return chapter.restart();
+ function updatePoint() {
+ if (context.mode().id !== "select" || !_pointID || !context.hasEntity(_pointID)) {
+ return continueTo(reselectPoint);
}
- var padding = 40 * Math.pow(2, context.map().zoom() - 19);
- var box = pad(woodRoadAddNode, padding, context);
- var addNodeString = helpHtml("intro.lines.add_node" + (context.lastPointerType() === "mouse" ? "" : "_touch"));
- reveal(box, addNodeString);
- context.map().on("move.intro drawn.intro", function() {
- var padding2 = 40 * Math.pow(2, context.map().zoom() - 19);
- var box2 = pad(woodRoadAddNode, padding2, context);
- reveal(box2, addNodeString, { duration: 0 });
- });
- context.history().on("change.intro", function(changed) {
- if (!context.hasEntity(woodRoadID) || !context.hasEntity(woodRoadEndID)) {
- return continueTo(updateLine);
- }
- if (changed.created().length === 1) {
- timeout2(function() {
- continueTo(startDragEndpoint);
- }, 500);
- }
+ context.container().select(".inspector-wrap .panewrap").style("right", "0%");
+ context.on("exit.intro", function() {
+ continueTo(reselectPoint);
});
- context.on("enter.intro", function(mode) {
- if (mode.id !== "select") {
- continueTo(updateLine);
- }
+ 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.map().on("move.intro drawn.intro", null);
+ context.on("exit.intro", null);
context.history().on("change.intro", null);
- context.on("enter.intro", null);
nextStep();
}
}
- function startDragEndpoint() {
- if (!context.hasEntity(woodRoadID) || !context.hasEntity(woodRoadEndID)) {
- return continueTo(updateLine);
+ function updateCloseEditor() {
+ if (context.mode().id !== "select" || !_pointID || !context.hasEntity(_pointID)) {
+ return continueTo(reselectPoint);
}
- var padding = 100 * Math.pow(2, context.map().zoom() - 19);
- var box = pad(woodRoadDragEndpoint, padding, context);
- var startDragString = helpHtml("intro.lines.start_drag_endpoint" + (context.lastPointerType() === "mouse" ? "" : "_touch")) + helpHtml("intro.lines.drag_to_intersection");
- reveal(box, startDragString);
- context.map().on("move.intro drawn.intro", function() {
- if (!context.hasEntity(woodRoadID) || !context.hasEntity(woodRoadEndID)) {
- return continueTo(updateLine);
- }
- var padding2 = 100 * Math.pow(2, context.map().zoom() - 19);
- var box2 = pad(woodRoadDragEndpoint, padding2, context);
- reveal(box2, startDragString, { duration: 0 });
- var entity = context.entity(woodRoadEndID);
- if (geoSphericalDistance(entity.loc, woodRoadDragEndpoint) <= 4) {
- continueTo(finishDragEndpoint);
- }
+ 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.map().on("move.intro drawn.intro", null);
+ context.on("exit.intro", null);
nextStep();
}
}
- function finishDragEndpoint() {
- if (!context.hasEntity(woodRoadID) || !context.hasEntity(woodRoadEndID)) {
- return continueTo(updateLine);
- }
- var padding = 100 * Math.pow(2, context.map().zoom() - 19);
- var box = pad(woodRoadDragEndpoint, padding, context);
- var finishDragString = helpHtml("intro.lines.spot_looks_good") + helpHtml("intro.lines.finish_drag_endpoint" + (context.lastPointerType() === "mouse" ? "" : "_touch"));
- reveal(box, finishDragString);
- context.map().on("move.intro drawn.intro", function() {
- if (!context.hasEntity(woodRoadID) || !context.hasEntity(woodRoadEndID)) {
- return continueTo(updateLine);
- }
- var padding2 = 100 * Math.pow(2, context.map().zoom() - 19);
- var box2 = pad(woodRoadDragEndpoint, padding2, context);
- reveal(box2, finishDragString, { duration: 0 });
- var entity = context.entity(woodRoadEndID);
- if (geoSphericalDistance(entity.loc, woodRoadDragEndpoint) > 4) {
- continueTo(startDragEndpoint);
- }
- });
- context.on("enter.intro", function() {
- continueTo(startDragMidpoint);
+ 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.map().on("move.intro drawn.intro", null);
context.on("enter.intro", null);
+ context.map().on("move.intro", null);
nextStep();
}
}
- function startDragMidpoint() {
- if (!context.hasEntity(woodRoadID) || !context.hasEntity(woodRoadEndID)) {
- return continueTo(updateLine);
- }
- if (context.selectedIDs().indexOf(woodRoadID) === -1) {
- context.enter(modeSelect(context, [woodRoadID]));
+ 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);
}
- var padding = 80 * Math.pow(2, context.map().zoom() - 19);
- var box = pad(woodRoadDragMidpoint, padding, context);
- reveal(box, helpHtml("intro.lines.start_drag_midpoint"));
- context.map().on("move.intro drawn.intro", function() {
- if (!context.hasEntity(woodRoadID) || !context.hasEntity(woodRoadEndID)) {
- return continueTo(updateLine);
- }
- var padding2 = 80 * Math.pow(2, context.map().zoom() - 19);
- var box2 = pad(woodRoadDragMidpoint, padding2, context);
- reveal(box2, helpHtml("intro.lines.start_drag_midpoint"), { duration: 0 });
+ reveal(
+ ".edit-menu",
+ helpHtml("intro.points.delete"),
+ { padding: 50 }
+ );
+ timeout2(function() {
+ context.map().on("move.intro", function() {
+ if (selectMenuItem(context, "delete").empty()) {
+ return continueTo(rightClickPoint);
+ }
+ 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.created().length === 1) {
- continueTo(continueDragMidpoint);
- }
- });
- context.on("enter.intro", function(mode) {
- if (mode.id !== "select") {
- context.enter(modeSelect(context, [woodRoadID]));
+ if (changed.deleted().length) {
+ continueTo(undo);
}
});
function continueTo(nextStep) {
- context.map().on("move.intro drawn.intro", null);
+ context.map().on("move.intro", null);
context.history().on("change.intro", null);
- context.on("enter.intro", null);
+ context.on("exit.intro", null);
nextStep();
}
}
- function continueDragMidpoint() {
- if (!context.hasEntity(woodRoadID) || !context.hasEntity(woodRoadEndID)) {
- return continueTo(updateLine);
- }
- var padding = 100 * Math.pow(2, context.map().zoom() - 19);
- var box = pad(woodRoadDragEndpoint, padding, context);
- box.height += 400;
- var advance = function() {
- context.history().checkpoint("doneUpdateLine");
- continueTo(deleteLines);
- };
- reveal(box, helpHtml("intro.lines.continue_drag_midpoint"), { buttonText: _t.html("intro.ok"), buttonCallback: advance });
- context.map().on("move.intro drawn.intro", function() {
- if (!context.hasEntity(woodRoadID) || !context.hasEntity(woodRoadEndID)) {
- return continueTo(updateLine);
- }
- var padding2 = 100 * Math.pow(2, context.map().zoom() - 19);
- var box2 = pad(woodRoadDragEndpoint, padding2, context);
- box2.height += 400;
- reveal(box2, helpHtml("intro.lines.continue_drag_midpoint"), { duration: 0, buttonText: _t.html("intro.ok"), buttonCallback: advance });
+ function undo() {
+ context.history().on("change.intro", function() {
+ continueTo(play);
});
+ reveal(
+ ".top-toolbar button.undo-button",
+ helpHtml("intro.points.undo")
+ );
function continueTo(nextStep) {
- context.map().on("move.intro drawn.intro", null);
+ context.history().on("change.intro", null);
nextStep();
}
}
- function deleteLines() {
- context.history().reset("doneUpdateLine");
+ 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));
- if (!context.hasEntity(washingtonStreetID) || !context.hasEntity(twelfthAvenueID) || !context.hasEntity(eleventhAvenueEndID)) {
- return chapter.restart();
- }
- var msec = transitionTime(deleteLinesLoc, context.map().center());
+ context.history().reset("initial");
+ _areaID = null;
+ var msec = transitionTime(playground, context.map().center());
if (msec) {
reveal(null, null, { duration: 0 });
}
- context.map().centerZoomEase(deleteLinesLoc, 18, msec);
- timeout2(function() {
- var padding = 200 * Math.pow(2, context.map().zoom() - 18);
- var box = pad(deleteLinesLoc, padding, context);
- box.top -= 200;
- box.height += 400;
- var advance = function() {
- continueTo(rightClickIntersection);
- };
- reveal(box, helpHtml("intro.lines.delete_lines", { street: _t("intro.graph.name.12th-avenue") }), { buttonText: _t.html("intro.ok"), buttonCallback: advance });
- context.map().on("move.intro drawn.intro", function() {
- var padding2 = 200 * Math.pow(2, context.map().zoom() - 18);
- var box2 = pad(deleteLinesLoc, padding2, context);
- box2.top -= 200;
- box2.height += 400;
- reveal(box2, helpHtml("intro.lines.delete_lines", { street: _t("intro.graph.name.12th-avenue") }), { duration: 0, buttonText: _t.html("intro.ok"), buttonCallback: advance });
- });
- context.history().on("change.intro", function() {
- timeout2(function() {
- continueTo(deleteLines);
- }, 500);
- });
- }, msec + 100);
- function continueTo(nextStep) {
- context.map().on("move.intro drawn.intro", null);
- context.history().on("change.intro", null);
- nextStep();
- }
- }
- function rightClickIntersection() {
- context.history().reset("doneUpdateLine");
- context.enter(modeBrowse(context));
- context.map().centerZoomEase(eleventhAvenueEnd, 18, 500);
- var rightClickString = helpHtml("intro.lines.split_street", {
- street1: _t("intro.graph.name.11th-avenue"),
- street2: _t("intro.graph.name.washington-street")
- }) + helpHtml("intro.lines." + (context.lastPointerType() === "mouse" ? "rightclick_intersection" : "edit_menu_intersection_touch"));
+ context.map().centerZoomEase(playground, 19, msec);
timeout2(function() {
- var padding = 60 * Math.pow(2, context.map().zoom() - 18);
- var box = pad(eleventhAvenueEnd, padding, context);
- reveal(box, rightClickString);
- context.map().on("move.intro drawn.intro", function() {
- var padding2 = 60 * Math.pow(2, context.map().zoom() - 18);
- var box2 = pad(eleventhAvenueEnd, padding2, context);
- reveal(box2, rightClickString, { duration: 0 });
- });
+ 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 !== "select")
- return;
- var ids = context.selectedIDs();
- if (ids.length !== 1 || ids[0] !== eleventhAvenueEndID)
- return;
- timeout2(function() {
- var node = selectMenuItem(context, "split").node();
- if (!node)
- return;
- continueTo(splitIntersection);
- }, 50);
- });
- context.history().on("change.intro", function() {
- timeout2(function() {
- continueTo(deleteLines);
- }, 300);
+ if (mode.id !== "add-area") return;
+ continueTo(startPlayground);
});
- }, 600);
+ }, msec + 100);
function continueTo(nextStep) {
- context.map().on("move.intro drawn.intro", null);
context.on("enter.intro", null);
- context.history().on("change.intro", null);
nextStep();
}
}
- function splitIntersection() {
- if (!context.hasEntity(washingtonStreetID) || !context.hasEntity(twelfthAvenueID) || !context.hasEntity(eleventhAvenueEndID)) {
- return continueTo(deleteLines);
- }
- var node = selectMenuItem(context, "split").node();
- if (!node) {
- return continueTo(rightClickIntersection);
+ function startPlayground() {
+ if (context.mode().id !== "add-area") {
+ return chapter.restart();
}
- var wasChanged = false;
- _washingtonSegmentID = null;
- reveal(".edit-menu", helpHtml("intro.lines.split_intersection", { street: _t("intro.graph.name.washington-street") }), { padding: 50 });
- context.map().on("move.intro drawn.intro", function() {
- var node2 = selectMenuItem(context, "split").node();
- if (!wasChanged && !node2) {
- return continueTo(rightClickIntersection);
- }
- reveal(".edit-menu", helpHtml("intro.lines.split_intersection", { street: _t("intro.graph.name.washington-street") }), { duration: 0, padding: 50 });
- });
- context.history().on("change.intro", function(changed) {
- wasChanged = true;
+ _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() {
- if (context.history().undoAnnotation() === _t("operations.split.annotation.line", { n: 1 })) {
- _washingtonSegmentID = changed.created()[0].id;
- continueTo(didSplit);
- } else {
- _washingtonSegmentID = null;
- continueTo(retrySplit);
- }
- }, 300);
- });
+ 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.history().on("change.intro", null);
+ context.on("enter.intro", null);
nextStep();
}
}
- function retrySplit() {
- context.enter(modeBrowse(context));
- context.map().centerZoomEase(eleventhAvenueEnd, 18, 500);
- var advance = function() {
- continueTo(rightClickIntersection);
- };
- var padding = 60 * Math.pow(2, context.map().zoom() - 18);
- var box = pad(eleventhAvenueEnd, padding, context);
- reveal(box, helpHtml("intro.lines.retry_split"), { buttonText: _t.html("intro.ok"), buttonCallback: advance });
- context.map().on("move.intro drawn.intro", function() {
- var padding2 = 60 * Math.pow(2, context.map().zoom() - 18);
- var box2 = pad(eleventhAvenueEnd, padding2, context);
- reveal(box2, helpHtml("intro.lines.retry_split"), { duration: 0, buttonText: _t.html("intro.ok"), buttonCallback: advance });
+ 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 didSplit() {
- if (!_washingtonSegmentID || !context.hasEntity(_washingtonSegmentID) || !context.hasEntity(washingtonStreetID) || !context.hasEntity(twelfthAvenueID) || !context.hasEntity(eleventhAvenueEndID)) {
- return continueTo(rightClickIntersection);
+ function finishPlayground() {
+ if (context.mode().id !== "draw-area") {
+ return chapter.restart();
}
- var ids = context.selectedIDs();
- var string = "intro.lines.did_split_" + (ids.length > 1 ? "multi" : "single");
- var street = _t("intro.graph.name.washington-street");
- var padding = 200 * Math.pow(2, context.map().zoom() - 18);
- var box = pad(twelfthAvenue, padding, context);
- box.width = box.width / 2;
- reveal(box, helpHtml(string, { street1: street, street2: street }), { duration: 500 });
+ _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().centerZoomEase(twelfthAvenue, 18, 500);
context.map().on("move.intro drawn.intro", function() {
- var padding2 = 200 * Math.pow(2, context.map().zoom() - 18);
- var box2 = pad(twelfthAvenue, padding2, context);
- box2.width = box2.width / 2;
- reveal(box2, helpHtml(string, { street1: street, street2: street }), { duration: 0 });
+ revealPlayground(
+ playground,
+ finishString,
+ { duration: 0 }
+ );
});
- }, 600);
- context.on("enter.intro", function() {
- var ids2 = context.selectedIDs();
- if (ids2.length === 1 && ids2[0] === _washingtonSegmentID) {
- continueTo(multiSelect);
- }
- });
- context.history().on("change.intro", function() {
- if (!_washingtonSegmentID || !context.hasEntity(_washingtonSegmentID) || !context.hasEntity(washingtonStreetID) || !context.hasEntity(twelfthAvenueID) || !context.hasEntity(eleventhAvenueEndID)) {
- return continueTo(rightClickIntersection);
+ }, 250);
+ context.on("enter.intro", function(mode) {
+ if (mode.id === "draw-area") {
+ 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);
- context.history().on("change.intro", null);
nextStep();
}
}
- function multiSelect() {
- if (!_washingtonSegmentID || !context.hasEntity(_washingtonSegmentID) || !context.hasEntity(washingtonStreetID) || !context.hasEntity(twelfthAvenueID) || !context.hasEntity(eleventhAvenueEndID)) {
- return continueTo(rightClickIntersection);
+ function searchPresets() {
+ if (!_areaID || !context.hasEntity(_areaID)) {
+ return addArea();
}
var ids = context.selectedIDs();
- var hasWashington = ids.indexOf(_washingtonSegmentID) !== -1;
- var hasTwelfth = ids.indexOf(twelfthAvenueID) !== -1;
- if (hasWashington && hasTwelfth) {
- return continueTo(multiRightClick);
- } else if (!hasWashington && !hasTwelfth) {
- return continueTo(didSplit);
+ if (context.mode().id !== "select" || !ids.length || ids[0] !== _areaID) {
+ context.enter(modeSelect(context, [_areaID]));
}
- context.map().centerZoomEase(twelfthAvenue, 18, 500);
+ context.container().select(".inspector-wrap").on("wheel.intro", eventCancel);
timeout2(function() {
- var selected, other, padding, box;
- if (hasWashington) {
- selected = _t("intro.graph.name.washington-street");
- other = _t("intro.graph.name.12th-avenue");
- padding = 60 * Math.pow(2, context.map().zoom() - 18);
- box = pad(twelfthAvenueEnd, padding, context);
- box.width *= 3;
- } else {
- selected = _t("intro.graph.name.12th-avenue");
- other = _t("intro.graph.name.washington-street");
- padding = 200 * Math.pow(2, context.map().zoom() - 18);
- box = pad(twelfthAvenue, padding, context);
- box.width /= 2;
+ context.container().select(".inspector-wrap .panewrap").style("right", "-100%");
+ context.container().select(".preset-search-input").on("keydown.intro", null).on("keyup.intro", checkPresetSearch);
+ reveal(
+ ".preset-search-input",
+ helpHtml("intro.areas.search_playground", { preset: playgroundPreset.name() })
+ );
+ }, 400);
+ context.on("enter.intro", function(mode) {
+ if (!_areaID || !context.hasEntity(_areaID)) {
+ return continueTo(addArea);
}
- reveal(box, helpHtml("intro.lines.multi_select", { selected, other1: other }) + " " + helpHtml("intro.lines.add_to_selection_" + (context.lastPointerType() === "mouse" ? "click" : "touch"), { selected, other2: other }));
- context.map().on("move.intro drawn.intro", function() {
- if (hasWashington) {
- selected = _t("intro.graph.name.washington-street");
- other = _t("intro.graph.name.12th-avenue");
- padding = 60 * Math.pow(2, context.map().zoom() - 18);
- box = pad(twelfthAvenueEnd, padding, context);
- box.width *= 3;
- } else {
- selected = _t("intro.graph.name.12th-avenue");
- other = _t("intro.graph.name.washington-street");
- padding = 200 * Math.pow(2, context.map().zoom() - 18);
- box = pad(twelfthAvenue, padding, context);
- box.width /= 2;
- }
- reveal(box, helpHtml("intro.lines.multi_select", { selected, other1: other }) + " " + helpHtml("intro.lines.add_to_selection_" + (context.lastPointerType() === "mouse" ? "click" : "touch"), { selected, other2: other }), { duration: 0 });
- });
- context.on("enter.intro", function() {
- continueTo(multiSelect);
- });
- context.history().on("change.intro", function() {
- if (!_washingtonSegmentID || !context.hasEntity(_washingtonSegmentID) || !context.hasEntity(washingtonStreetID) || !context.hasEntity(twelfthAvenueID) || !context.hasEntity(eleventhAvenueEndID)) {
- return continueTo(rightClickIntersection);
- }
- });
- }, 600);
+ var ids2 = context.selectedIDs();
+ if (mode.id !== "select" || !ids2.length || ids2[0] !== _areaID) {
+ context.enter(modeSelect(context, [_areaID]));
+ context.container().select(".inspector-wrap .panewrap").style("right", "-100%");
+ 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.areas.search_playground", { preset: playgroundPreset.name() })
+ );
+ context.history().on("change.intro", null);
+ }
+ });
+ function checkPresetSearch() {
+ var first = context.container().select(".preset-list-item:first-child");
+ if (first.classed("preset-leisure-playground")) {
+ reveal(
+ first.select(".preset-list-button").node(),
+ helpHtml("intro.areas.choose_playground", { preset: playgroundPreset.name() }),
+ { duration: 300 }
+ );
+ context.container().select(".preset-search-input").on("keydown.intro", eventCancel, true).on("keyup.intro", null);
+ context.history().on("change.intro", function() {
+ continueTo(clickAddField);
+ });
+ }
+ }
function continueTo(nextStep) {
- context.map().on("move.intro drawn.intro", null);
+ context.container().select(".inspector-wrap").on("wheel.intro", null);
context.on("enter.intro", null);
context.history().on("change.intro", null);
+ context.container().select(".preset-search-input").on("keydown.intro keyup.intro", null);
nextStep();
}
}
- function multiRightClick() {
- if (!_washingtonSegmentID || !context.hasEntity(_washingtonSegmentID) || !context.hasEntity(washingtonStreetID) || !context.hasEntity(twelfthAvenueID) || !context.hasEntity(eleventhAvenueEndID)) {
- return continueTo(rightClickIntersection);
+ function clickAddField() {
+ if (!_areaID || !context.hasEntity(_areaID)) {
+ return addArea();
}
- var padding = 200 * Math.pow(2, context.map().zoom() - 18);
- var box = pad(twelfthAvenue, padding, context);
- var rightClickString = helpHtml("intro.lines.multi_select_success") + helpHtml("intro.lines.multi_" + (context.lastPointerType() === "mouse" ? "rightclick" : "edit_menu_touch"));
- reveal(box, rightClickString);
- context.map().on("move.intro drawn.intro", function() {
- var padding2 = 200 * Math.pow(2, context.map().zoom() - 18);
- var box2 = pad(twelfthAvenue, padding2, context);
- reveal(box2, rightClickString, { duration: 0 });
- });
- context.ui().editMenu().on("toggled.intro", function(open) {
- if (!open)
- return;
+ var ids = context.selectedIDs();
+ if (context.mode().id !== "select" || !ids.length || ids[0] !== _areaID) {
+ return searchPresets();
+ }
+ if (!context.container().select(".form-field-description").empty()) {
+ return continueTo(describePlayground);
+ }
+ context.container().select(".inspector-wrap").on("wheel.intro", eventCancel);
+ timeout2(function() {
+ context.container().select(".inspector-wrap .panewrap").style("right", "0%");
+ var entity = context.entity(_areaID);
+ if (entity.tags.description) {
+ return continueTo(play);
+ }
+ var box = context.container().select(".more-fields").node().getBoundingClientRect();
+ if (box.top > 300) {
+ var pane = context.container().select(".entity-editor-pane .inspector-body");
+ var start2 = pane.node().scrollTop;
+ var end = start2 + (box.top - 300);
+ pane.transition().duration(250).tween("scroll.inspector", function() {
+ var node = this;
+ var i3 = number_default(start2, end);
+ return function(t2) {
+ node.scrollTop = i3(t2);
+ };
+ });
+ }
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;
- continueTo(multiDelete);
- } else if (ids.length === 1 && ids.indexOf(_washingtonSegmentID) !== -1) {
- return continueTo(multiSelect);
- } else {
- return continueTo(didSplit);
- }
+ reveal(
+ ".more-fields .combobox-input",
+ helpHtml("intro.areas.add_field", {
+ name: nameField.title(),
+ description: descriptionField.title()
+ }),
+ { duration: 300 }
+ );
+ context.container().select(".more-fields .combobox-input").on("click.intro", function() {
+ var watcher;
+ watcher = window.setInterval(function() {
+ if (!context.container().select("div.combobox").empty()) {
+ window.clearInterval(watcher);
+ continueTo(chooseDescriptionField);
+ }
+ }, 300);
+ });
}, 300);
+ }, 400);
+ context.on("exit.intro", function() {
+ return continueTo(searchPresets);
});
- context.history().on("change.intro", function() {
- if (!_washingtonSegmentID || !context.hasEntity(_washingtonSegmentID) || !context.hasEntity(washingtonStreetID) || !context.hasEntity(twelfthAvenueID) || !context.hasEntity(eleventhAvenueEndID)) {
- return continueTo(rightClickIntersection);
+ function continueTo(nextStep) {
+ context.container().select(".inspector-wrap").on("wheel.intro", null);
+ context.container().select(".more-fields .combobox-input").on("click.intro", null);
+ context.on("exit.intro", null);
+ nextStep();
+ }
+ }
+ function chooseDescriptionField() {
+ if (!_areaID || !context.hasEntity(_areaID)) {
+ return addArea();
+ }
+ var ids = context.selectedIDs();
+ if (context.mode().id !== "select" || !ids.length || ids[0] !== _areaID) {
+ return searchPresets();
+ }
+ if (!context.container().select(".form-field-description").empty()) {
+ return continueTo(describePlayground);
+ }
+ if (context.container().select("div.combobox").empty()) {
+ return continueTo(clickAddField);
+ }
+ var watcher;
+ watcher = window.setInterval(function() {
+ if (context.container().select("div.combobox").empty()) {
+ window.clearInterval(watcher);
+ timeout2(function() {
+ if (context.container().select(".form-field-description").empty()) {
+ continueTo(retryChooseDescription);
+ } else {
+ continueTo(describePlayground);
+ }
+ }, 300);
}
+ }, 300);
+ reveal(
+ "div.combobox",
+ helpHtml("intro.areas.choose_field", { field: descriptionField.title() }),
+ { duration: 300 }
+ );
+ context.on("exit.intro", function() {
+ return continueTo(searchPresets);
});
function continueTo(nextStep) {
- context.map().on("move.intro drawn.intro", null);
- context.ui().editMenu().on("toggled.intro", null);
- context.history().on("change.intro", null);
+ if (watcher) window.clearInterval(watcher);
+ context.on("exit.intro", null);
nextStep();
}
}
- function multiDelete() {
- if (!_washingtonSegmentID || !context.hasEntity(_washingtonSegmentID) || !context.hasEntity(washingtonStreetID) || !context.hasEntity(twelfthAvenueID) || !context.hasEntity(eleventhAvenueEndID)) {
- return continueTo(rightClickIntersection);
+ function describePlayground() {
+ if (!_areaID || !context.hasEntity(_areaID)) {
+ return addArea();
+ }
+ var ids = context.selectedIDs();
+ if (context.mode().id !== "select" || !ids.length || ids[0] !== _areaID) {
+ return searchPresets();
+ }
+ context.container().select(".inspector-wrap .panewrap").style("right", "0%");
+ if (context.container().select(".form-field-description").empty()) {
+ return continueTo(retryChooseDescription);
}
- var node = selectMenuItem(context, "delete").node();
- if (!node)
- return continueTo(multiRightClick);
- reveal(".edit-menu", helpHtml("intro.lines.multi_delete"), { padding: 50 });
- context.map().on("move.intro drawn.intro", function() {
- reveal(".edit-menu", helpHtml("intro.lines.multi_delete"), { duration: 0, padding: 50 });
- });
context.on("exit.intro", function() {
- if (context.hasEntity(_washingtonSegmentID) || context.hasEntity(twelfthAvenueID)) {
- return continueTo(multiSelect);
- }
- });
- context.history().on("change.intro", function() {
- if (context.hasEntity(_washingtonSegmentID) || context.hasEntity(twelfthAvenueID)) {
- continueTo(retryDelete);
- } else {
- continueTo(play);
- }
+ continueTo(play);
});
+ reveal(
+ ".entity-editor-pane",
+ helpHtml("intro.areas.describe_playground", { button: { html: icon("#iD-icon-close", "inline") } }),
+ { duration: 300 }
+ );
function continueTo(nextStep) {
- context.map().on("move.intro drawn.intro", null);
context.on("exit.intro", null);
- context.history().on("change.intro", null);
nextStep();
}
}
- function retryDelete() {
- context.enter(modeBrowse(context));
- var padding = 200 * Math.pow(2, context.map().zoom() - 18);
- var box = pad(twelfthAvenue, padding, context);
- reveal(box, helpHtml("intro.lines.retry_delete"), {
- buttonText: _t.html("intro.ok"),
- buttonCallback: function() {
- continueTo(multiSelect);
+ function retryChooseDescription() {
+ if (!_areaID || !context.hasEntity(_areaID)) {
+ return addArea();
+ }
+ var ids = context.selectedIDs();
+ if (context.mode().id !== "select" || !ids.length || ids[0] !== _areaID) {
+ return searchPresets();
+ }
+ context.container().select(".inspector-wrap .panewrap").style("right", "0%");
+ reveal(
+ ".entity-editor-pane",
+ helpHtml("intro.areas.retry_add_field", { field: descriptionField.title() }),
+ {
+ buttonText: _t.html("intro.ok"),
+ buttonCallback: function() {
+ continueTo(clickAddField);
+ }
}
+ );
+ context.on("exit.intro", function() {
+ return continueTo(searchPresets);
});
function continueTo(nextStep) {
+ context.on("exit.intro", null);
nextStep();
}
}
function play() {
- dispatch10.call("done");
- reveal(".ideditor", helpHtml("intro.lines.play", { next: _t("intro.buildings.title") }), {
- tooltipBox: ".intro-nav-wrap .chapter-building",
- buttonText: _t.html("intro.ok"),
- buttonCallback: function() {
- reveal(".ideditor");
+ dispatch14.call("done");
+ reveal(
+ ".ideditor",
+ helpHtml("intro.areas.play", { next: _t("intro.lines.title") }),
+ {
+ tooltipBox: ".intro-nav-wrap .chapter-line",
+ buttonText: _t.html("intro.ok"),
+ buttonCallback: function() {
+ reveal(".ideditor");
+ }
}
- });
+ );
}
chapter.enter = function() {
- addLine();
+ addArea();
};
chapter.exit = function() {
timeouts.forEach(window.clearTimeout);
- select_default2(window).on("pointerdown.intro mousedown.intro", null, true);
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(".preset-list-button").on("click.intro", null);
+ context.container().select(".preset-search-input").on("keydown.intro keyup.intro", null);
+ context.container().select(".more-fields .combobox-input").on("click.intro", null);
};
chapter.restart = function() {
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 house = [-85.62815, 41.95638];
- var tank = [-85.62732, 41.95347];
- var buildingCatetory = _mainPresetIndex.item("category-building");
- var housePreset = _mainPresetIndex.item("building/house");
- var tankPreset = _mainPresetIndex.item("man_made/storage_tank");
+ // modules/ui/intro/line.js
+ function uiIntroLine(context, reveal) {
+ var dispatch14 = dispatch_default("done");
var timeouts = [];
- var _houseID = null;
- var _tankID = null;
+ var _tulipRoadID = null;
+ var flowerRoadID = "w646";
+ var tulipRoadStart = [-85.6297754121684, 41.95805253325314];
+ var tulipRoadMidpoint = [-85.62975395449628, 41.95787501510204];
+ var tulipRoadIntersection = [-85.62974496187628, 41.95742515554585];
+ var roadCategory = _mainPresetIndex.item("category-road_minor");
+ var residentialPreset = _mainPresetIndex.item("highway/residential");
+ var woodRoadID = "w525";
+ var woodRoadEndID = "n2862";
+ var woodRoadAddNode = [-85.62390110349587, 41.95397111462291];
+ var woodRoadDragEndpoint = [-85.623867390213, 41.95466987786487];
+ var woodRoadDragMidpoint = [-85.62386254803509, 41.95430395953872];
+ var washingtonStreetID = "w522";
+ var twelfthAvenueID = "w1";
+ var eleventhAvenueEndID = "n3550";
+ var twelfthAvenueEndID = "n5";
+ var _washingtonSegmentID = null;
+ var eleventhAvenueEnd = context.entity(eleventhAvenueEndID).loc;
+ var twelfthAvenueEnd = context.entity(twelfthAvenueEndID).loc;
+ var deleteLinesLoc = [-85.6219395542764, 41.95228033922477];
+ var twelfthAvenue = [-85.62219310052491, 41.952505413152956];
var chapter = {
- title: "intro.buildings.title"
+ 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();
d3_event.preventDefault();
}
- function revealHouse(center, text2, options2) {
- var padding = 160 * Math.pow(2, context.map().zoom() - 20);
- var box = pad(center, padding, context);
- reveal(box, text2, options2);
- }
- function revealTank(center, text2, options2) {
- var padding = 190 * Math.pow(2, context.map().zoom() - 19.5);
- var box = pad(center, padding, context);
- reveal(box, text2, options2);
- }
- function addHouse() {
+ function addLine() {
context.enter(modeBrowse(context));
context.history().reset("initial");
- _houseID = null;
- var msec = transitionTime(house, context.map().center());
+ var msec = transitionTime(tulipRoadStart, context.map().center());
if (msec) {
reveal(null, null, { duration: 0 });
}
- context.map().centerZoomEase(house, 19, msec);
+ context.map().centerZoomEase(tulipRoadStart, 18.5, msec);
timeout2(function() {
- var tooltip = reveal("button.add-area", helpHtml("intro.buildings.add_building"));
- tooltip.selectAll(".popover-inner").insert("svg", "span").attr("class", "tooltip-illustration").append("use").attr("xlink:href", "#iD-graphic-buildings");
+ var tooltip = reveal(
+ "button.add-line",
+ helpHtml("intro.lines.add_line")
+ );
+ 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-area")
- return;
- continueTo(startHouse);
+ if (mode.id !== "add-line") return;
+ continueTo(startLine);
});
}, msec + 100);
function continueTo(nextStep) {
@@ -54414,495 +58727,797 @@ ${content}
nextStep();
}
}
- function startHouse() {
- if (context.mode().id !== "add-area") {
- return continueTo(addHouse);
- }
- _houseID = null;
- context.map().zoomEase(20, 500);
- timeout2(function() {
- var startString = helpHtml("intro.buildings.start_building") + helpHtml("intro.buildings.building_corner_" + (context.lastPointerType() === "mouse" ? "click" : "tap"));
- revealHouse(house, startString);
- context.map().on("move.intro drawn.intro", function() {
- revealHouse(house, startString, { duration: 0 });
- });
- context.on("enter.intro", function(mode) {
- if (mode.id !== "draw-area")
- return chapter.restart();
- continueTo(continueHouse);
- });
- }, 550);
+ function startLine() {
+ 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);
+ box.height = box.height + 100;
+ var textId = context.lastPointerType() === "mouse" ? "start_line" : "start_line_tap";
+ var startLineString = helpHtml("intro.lines.missing_road") + "{br}" + helpHtml("intro.lines.line_draw_info") + helpHtml("intro.lines." + textId);
+ reveal(box, startLineString);
+ context.map().on("move.intro drawn.intro", function() {
+ padding = 70 * Math.pow(2, context.map().zoom() - 18);
+ box = pad(tulipRoadStart, padding, context);
+ box.height = box.height + 100;
+ reveal(box, startLineString, { duration: 0 });
+ });
+ context.on("enter.intro", function(mode) {
+ if (mode.id !== "draw-line") return chapter.restart();
+ continueTo(drawLine);
+ });
function continueTo(nextStep) {
context.map().on("move.intro drawn.intro", null);
context.on("enter.intro", null);
nextStep();
}
}
- function continueHouse() {
- if (context.mode().id !== "draw-area") {
- return continueTo(addHouse);
- }
- _houseID = null;
- var continueString = helpHtml("intro.buildings.continue_building") + "{br}" + helpHtml("intro.areas.finish_area_" + (context.lastPointerType() === "mouse" ? "click" : "tap")) + helpHtml("intro.buildings.finish_building");
- revealHouse(house, continueString);
- context.map().on("move.intro drawn.intro", function() {
- revealHouse(house, continueString, { duration: 0 });
+ function drawLine() {
+ if (context.mode().id !== "draw-line") return chapter.restart();
+ _tulipRoadID = context.mode().selectedIDs()[0];
+ context.map().centerEase(tulipRoadMidpoint, 500);
+ timeout2(function() {
+ var padding = 200 * Math.pow(2, context.map().zoom() - 18.5);
+ var box = pad(tulipRoadMidpoint, padding, context);
+ box.height = box.height * 2;
+ reveal(
+ box,
+ helpHtml("intro.lines.intersect", { name: _t("intro.graph.name.flower-street") })
+ );
+ context.map().on("move.intro drawn.intro", function() {
+ padding = 200 * Math.pow(2, context.map().zoom() - 18.5);
+ box = pad(tulipRoadMidpoint, padding, context);
+ box.height = box.height * 2;
+ reveal(
+ box,
+ helpHtml("intro.lines.intersect", { name: _t("intro.graph.name.flower-street") }),
+ { duration: 0 }
+ );
+ });
+ }, 550);
+ context.history().on("change.intro", function() {
+ if (isLineConnected()) {
+ continueTo(continueLine);
+ }
});
context.on("enter.intro", function(mode) {
- if (mode.id === "draw-area") {
+ if (mode.id === "draw-line") {
return;
} else if (mode.id === "select") {
- 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);
- });
- if (isMostlySquare(points)) {
- _houseID = way.id;
- return continueTo(chooseCategoryBuilding);
- } else {
- return continueTo(retryHouse);
- }
+ continueTo(retryIntersect);
+ return;
} else {
return chapter.restart();
}
});
function continueTo(nextStep) {
context.map().on("move.intro drawn.intro", null);
+ context.history().on("change.intro", null);
context.on("enter.intro", null);
nextStep();
}
}
- function retryHouse() {
- var onClick = function() {
- continueTo(addHouse);
- };
- revealHouse(house, helpHtml("intro.buildings.retry_building"), { buttonText: _t.html("intro.ok"), buttonCallback: onClick });
- context.map().on("move.intro drawn.intro", function() {
- revealHouse(house, helpHtml("intro.buildings.retry_building"), { duration: 0, buttonText: _t.html("intro.ok"), buttonCallback: onClick });
+ function isLineConnected() {
+ var entity = _tulipRoadID && context.hasEntity(_tulipRoadID);
+ if (!entity) return false;
+ var drawNodes = context.graph().childNodes(entity);
+ return drawNodes.some(function(node) {
+ return context.graph().parentWays(node).some(function(parent) {
+ return parent.id === flowerRoadID;
+ });
+ });
+ }
+ function retryIntersect() {
+ select_default2(window).on("pointerdown.intro mousedown.intro", eventCancel, true);
+ var box = pad(tulipRoadIntersection, 80, context);
+ reveal(
+ box,
+ helpHtml("intro.lines.retry_intersect", { name: _t("intro.graph.name.flower-street") })
+ );
+ timeout2(chapter.restart, 3e3);
+ }
+ function continueLine() {
+ if (context.mode().id !== "draw-line") return chapter.restart();
+ var entity = _tulipRoadID && context.hasEntity(_tulipRoadID);
+ 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(".main-map .surface", continueLineText);
+ context.on("enter.intro", function(mode) {
+ if (mode.id === "draw-line") {
+ return;
+ } else if (mode.id === "select") {
+ return continueTo(chooseCategoryRoad);
+ } else {
+ return chapter.restart();
+ }
});
function continueTo(nextStep) {
- context.map().on("move.intro drawn.intro", null);
+ context.on("enter.intro", null);
nextStep();
}
}
- function chooseCategoryBuilding() {
- if (!_houseID || !context.hasEntity(_houseID)) {
- return addHouse();
- }
- var ids = context.selectedIDs();
- if (context.mode().id !== "select" || !ids.length || ids[0] !== _houseID) {
- context.enter(modeSelect(context, [_houseID]));
- }
+ function chooseCategoryRoad() {
+ 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();
context.container().select(".inspector-wrap").on("wheel.intro", eventCancel);
timeout2(function() {
context.container().select(".inspector-wrap .panewrap").style("right", "-100%");
- var button = context.container().select(".preset-category-building .preset-list-button");
- reveal(button.node(), helpHtml("intro.buildings.choose_category_building", { category: buildingCatetory.name() }));
+ reveal(
+ button.node(),
+ helpHtml("intro.lines.choose_category_road", { category: roadCategory.name() })
+ );
button.on("click.intro", function() {
- button.on("click.intro", null);
- continueTo(choosePresetHouse);
+ continueTo(choosePresetResidential);
});
}, 400);
- context.on("enter.intro", function(mode) {
- if (!_houseID || !context.hasEntity(_houseID)) {
- return continueTo(addHouse);
- }
- var ids2 = context.selectedIDs();
- if (mode.id !== "select" || !ids2.length || ids2[0] !== _houseID) {
- return continueTo(chooseCategoryBuilding);
- }
- });
function continueTo(nextStep) {
context.container().select(".inspector-wrap").on("wheel.intro", null);
context.container().select(".preset-list-button").on("click.intro", null);
- context.on("enter.intro", null);
+ context.on("exit.intro", null);
nextStep();
}
}
- function choosePresetHouse() {
- if (!_houseID || !context.hasEntity(_houseID)) {
- return addHouse();
- }
- var ids = context.selectedIDs();
- if (context.mode().id !== "select" || !ids.length || ids[0] !== _houseID) {
- context.enter(modeSelect(context, [_houseID]));
+ function choosePresetResidential() {
+ 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();
+ subgrid.selectAll(":not(.preset-highway-residential) .preset-list-button").on("click.intro", function() {
+ continueTo(retryPresetResidential);
+ });
+ subgrid.selectAll(".preset-highway-residential .preset-list-button").on("click.intro", function() {
+ continueTo(nameRoad);
+ });
+ timeout2(function() {
+ reveal(
+ subgrid.node(),
+ helpHtml("intro.lines.choose_preset_residential", { preset: residentialPreset.name() }),
+ { tooltipBox: ".preset-highway-residential .preset-list-button", duration: 300 }
+ );
+ }, 300);
+ function continueTo(nextStep) {
+ context.container().select(".preset-list-button").on("click.intro", null);
+ context.on("exit.intro", null);
+ nextStep();
}
+ }
+ function retryPresetResidential() {
+ if (context.mode().id !== "select") return chapter.restart();
+ context.on("exit.intro", function() {
+ return chapter.restart();
+ });
context.container().select(".inspector-wrap").on("wheel.intro", eventCancel);
timeout2(function() {
- context.container().select(".inspector-wrap .panewrap").style("right", "-100%");
- var button = context.container().select(".preset-building-house .preset-list-button");
- reveal(button.node(), helpHtml("intro.buildings.choose_preset_house", { preset: housePreset.name() }), { duration: 300 });
+ var button = context.container().select(".entity-editor-pane .preset-list-button");
+ reveal(
+ button.node(),
+ helpHtml("intro.lines.retry_preset_residential", { preset: residentialPreset.name() })
+ );
button.on("click.intro", function() {
- button.on("click.intro", null);
- continueTo(closeEditorHouse);
+ continueTo(chooseCategoryRoad);
});
- }, 400);
- context.on("enter.intro", function(mode) {
- if (!_houseID || !context.hasEntity(_houseID)) {
- return continueTo(addHouse);
- }
- var ids2 = context.selectedIDs();
- if (mode.id !== "select" || !ids2.length || ids2[0] !== _houseID) {
- return continueTo(chooseCategoryBuilding);
- }
- });
+ }, 500);
function continueTo(nextStep) {
context.container().select(".inspector-wrap").on("wheel.intro", null);
context.container().select(".preset-list-button").on("click.intro", null);
- context.on("enter.intro", null);
+ context.on("exit.intro", null);
nextStep();
}
}
- function closeEditorHouse() {
- if (!_houseID || !context.hasEntity(_houseID)) {
- return addHouse();
- }
- var ids = context.selectedIDs();
- if (context.mode().id !== "select" || !ids.length || ids[0] !== _houseID) {
- context.enter(modeSelect(context, [_houseID]));
- }
- context.history().checkpoint("hasHouse");
+ function nameRoad() {
context.on("exit.intro", function() {
- continueTo(rightClickHouse);
+ continueTo(didNameRoad);
});
timeout2(function() {
- reveal(".entity-editor-pane", helpHtml("intro.buildings.close", { button: { html: icon("#iD-icon-close", "inline") } }));
+ reveal(
+ ".entity-editor-pane",
+ helpHtml("intro.lines.name_road", { button: { html: icon("#iD-icon-close", "inline") } }),
+ { tooltipClass: "intro-lines-name_road" }
+ );
}, 500);
function continueTo(nextStep) {
context.on("exit.intro", null);
nextStep();
}
}
- function rightClickHouse() {
- if (!_houseID)
+ function didNameRoad() {
+ context.history().checkpoint("doneAddLine");
+ timeout2(function() {
+ reveal(".main-map .surface", helpHtml("intro.lines.did_name_road"), {
+ buttonText: _t.html("intro.ok"),
+ buttonCallback: function() {
+ continueTo(updateLine);
+ }
+ });
+ }, 500);
+ function continueTo(nextStep) {
+ nextStep();
+ }
+ }
+ function updateLine() {
+ context.history().reset("doneAddLine");
+ if (!context.hasEntity(woodRoadID) || !context.hasEntity(woodRoadEndID)) {
return chapter.restart();
- context.enter(modeBrowse(context));
- context.history().reset("hasHouse");
- var zoom = context.map().zoom();
- if (zoom < 20) {
- zoom = 20;
}
- context.map().centerZoomEase(house, zoom, 500);
- context.on("enter.intro", function(mode) {
- if (mode.id !== "select")
- return;
- var ids = context.selectedIDs();
- if (ids.length !== 1 || ids[0] !== _houseID)
- return;
- timeout2(function() {
- var node = selectMenuItem(context, "orthogonalize").node();
- if (!node)
- return;
- continueTo(clickSquare);
- }, 50);
- });
+ var msec = transitionTime(woodRoadDragMidpoint, context.map().center());
+ if (msec) {
+ reveal(null, null, { duration: 0 });
+ }
+ context.map().centerZoomEase(woodRoadDragMidpoint, 19, msec);
+ timeout2(function() {
+ var padding = 250 * Math.pow(2, context.map().zoom() - 19);
+ var box = pad(woodRoadDragMidpoint, padding, context);
+ var advance = function() {
+ continueTo(addNode);
+ };
+ reveal(
+ box,
+ helpHtml("intro.lines.update_line"),
+ { buttonText: _t.html("intro.ok"), buttonCallback: advance }
+ );
+ context.map().on("move.intro drawn.intro", function() {
+ var padding2 = 250 * Math.pow(2, context.map().zoom() - 19);
+ var box2 = pad(woodRoadDragMidpoint, padding2, context);
+ reveal(
+ box2,
+ helpHtml("intro.lines.update_line"),
+ { duration: 0, buttonText: _t.html("intro.ok"), buttonCallback: advance }
+ );
+ });
+ }, msec + 100);
+ function continueTo(nextStep) {
+ context.map().on("move.intro drawn.intro", null);
+ nextStep();
+ }
+ }
+ function addNode() {
+ context.history().reset("doneAddLine");
+ if (!context.hasEntity(woodRoadID) || !context.hasEntity(woodRoadEndID)) {
+ return chapter.restart();
+ }
+ var padding = 40 * Math.pow(2, context.map().zoom() - 19);
+ var box = pad(woodRoadAddNode, padding, context);
+ var addNodeString = helpHtml("intro.lines.add_node" + (context.lastPointerType() === "mouse" ? "" : "_touch"));
+ reveal(box, addNodeString);
context.map().on("move.intro drawn.intro", function() {
- var rightclickString = helpHtml("intro.buildings." + (context.lastPointerType() === "mouse" ? "rightclick_building" : "edit_menu_building_touch"));
- revealHouse(house, rightclickString, { duration: 0 });
+ var padding2 = 40 * Math.pow(2, context.map().zoom() - 19);
+ var box2 = pad(woodRoadAddNode, padding2, context);
+ reveal(box2, addNodeString, { duration: 0 });
});
- context.history().on("change.intro", function() {
- continueTo(rightClickHouse);
+ context.history().on("change.intro", function(changed) {
+ if (!context.hasEntity(woodRoadID) || !context.hasEntity(woodRoadEndID)) {
+ return continueTo(updateLine);
+ }
+ if (changed.created().length === 1) {
+ timeout2(function() {
+ continueTo(startDragEndpoint);
+ }, 500);
+ }
+ });
+ context.on("enter.intro", function(mode) {
+ if (mode.id !== "select") {
+ continueTo(updateLine);
+ }
});
function continueTo(nextStep) {
- context.on("enter.intro", null);
context.map().on("move.intro drawn.intro", null);
context.history().on("change.intro", null);
+ context.on("enter.intro", null);
nextStep();
}
}
- function clickSquare() {
- if (!_houseID)
- return chapter.restart();
- var entity = context.hasEntity(_houseID);
- if (!entity)
- return continueTo(rightClickHouse);
- var node = selectMenuItem(context, "orthogonalize").node();
- if (!node) {
- return continueTo(rightClickHouse);
+ function startDragEndpoint() {
+ if (!context.hasEntity(woodRoadID) || !context.hasEntity(woodRoadEndID)) {
+ return continueTo(updateLine);
}
- var wasChanged = false;
- reveal(".edit-menu", helpHtml("intro.buildings.square_building"), { padding: 50 });
- context.on("enter.intro", function(mode) {
- if (mode.id === "browse") {
- continueTo(rightClickHouse);
- } else if (mode.id === "move" || mode.id === "rotate") {
- continueTo(retryClickSquare);
+ var padding = 100 * Math.pow(2, context.map().zoom() - 19);
+ var box = pad(woodRoadDragEndpoint, padding, context);
+ var startDragString = helpHtml("intro.lines.start_drag_endpoint" + (context.lastPointerType() === "mouse" ? "" : "_touch")) + helpHtml("intro.lines.drag_to_intersection");
+ reveal(box, startDragString);
+ context.map().on("move.intro drawn.intro", function() {
+ if (!context.hasEntity(woodRoadID) || !context.hasEntity(woodRoadEndID)) {
+ return continueTo(updateLine);
+ }
+ var padding2 = 100 * Math.pow(2, context.map().zoom() - 19);
+ var box2 = pad(woodRoadDragEndpoint, padding2, context);
+ reveal(box2, startDragString, { duration: 0 });
+ var entity = context.entity(woodRoadEndID);
+ if (geoSphericalDistance(entity.loc, woodRoadDragEndpoint) <= 4) {
+ continueTo(finishDragEndpoint);
}
});
- context.map().on("move.intro", function() {
- var node2 = selectMenuItem(context, "orthogonalize").node();
- if (!wasChanged && !node2) {
- return continueTo(rightClickHouse);
+ function continueTo(nextStep) {
+ context.map().on("move.intro drawn.intro", null);
+ nextStep();
+ }
+ }
+ function finishDragEndpoint() {
+ if (!context.hasEntity(woodRoadID) || !context.hasEntity(woodRoadEndID)) {
+ return continueTo(updateLine);
+ }
+ var padding = 100 * Math.pow(2, context.map().zoom() - 19);
+ var box = pad(woodRoadDragEndpoint, padding, context);
+ var finishDragString = helpHtml("intro.lines.spot_looks_good") + helpHtml("intro.lines.finish_drag_endpoint" + (context.lastPointerType() === "mouse" ? "" : "_touch"));
+ reveal(box, finishDragString);
+ context.map().on("move.intro drawn.intro", function() {
+ if (!context.hasEntity(woodRoadID) || !context.hasEntity(woodRoadEndID)) {
+ return continueTo(updateLine);
+ }
+ var padding2 = 100 * Math.pow(2, context.map().zoom() - 19);
+ var box2 = pad(woodRoadDragEndpoint, padding2, context);
+ reveal(box2, finishDragString, { duration: 0 });
+ var entity = context.entity(woodRoadEndID);
+ if (geoSphericalDistance(entity.loc, woodRoadDragEndpoint) > 4) {
+ continueTo(startDragEndpoint);
}
- reveal(".edit-menu", helpHtml("intro.buildings.square_building"), { duration: 0, padding: 50 });
});
- context.history().on("change.intro", function() {
- wasChanged = true;
- context.history().on("change.intro", null);
- timeout2(function() {
- if (context.history().undoAnnotation() === _t("operations.orthogonalize.annotation.feature", { n: 1 })) {
- continueTo(doneSquare);
- } else {
- continueTo(retryClickSquare);
- }
- }, 500);
+ context.on("enter.intro", function() {
+ continueTo(startDragMidpoint);
});
function continueTo(nextStep) {
+ context.map().on("move.intro drawn.intro", null);
context.on("enter.intro", null);
- context.map().on("move.intro", null);
- context.history().on("change.intro", null);
nextStep();
}
}
- function retryClickSquare() {
- context.enter(modeBrowse(context));
- revealHouse(house, helpHtml("intro.buildings.retry_square"), {
- buttonText: _t.html("intro.ok"),
- buttonCallback: function() {
- continueTo(rightClickHouse);
+ function startDragMidpoint() {
+ if (!context.hasEntity(woodRoadID) || !context.hasEntity(woodRoadEndID)) {
+ return continueTo(updateLine);
+ }
+ if (context.selectedIDs().indexOf(woodRoadID) === -1) {
+ context.enter(modeSelect(context, [woodRoadID]));
+ }
+ var padding = 80 * Math.pow(2, context.map().zoom() - 19);
+ var box = pad(woodRoadDragMidpoint, padding, context);
+ reveal(box, helpHtml("intro.lines.start_drag_midpoint"));
+ context.map().on("move.intro drawn.intro", function() {
+ if (!context.hasEntity(woodRoadID) || !context.hasEntity(woodRoadEndID)) {
+ return continueTo(updateLine);
+ }
+ var padding2 = 80 * Math.pow(2, context.map().zoom() - 19);
+ var box2 = pad(woodRoadDragMidpoint, padding2, context);
+ reveal(box2, helpHtml("intro.lines.start_drag_midpoint"), { duration: 0 });
+ });
+ context.history().on("change.intro", function(changed) {
+ if (changed.created().length === 1) {
+ continueTo(continueDragMidpoint);
+ }
+ });
+ context.on("enter.intro", function(mode) {
+ if (mode.id !== "select") {
+ context.enter(modeSelect(context, [woodRoadID]));
}
});
function continueTo(nextStep) {
+ context.map().on("move.intro drawn.intro", null);
+ context.history().on("change.intro", null);
+ context.on("enter.intro", null);
nextStep();
}
}
- function doneSquare() {
- context.history().checkpoint("doneSquare");
- revealHouse(house, helpHtml("intro.buildings.done_square"), {
- buttonText: _t.html("intro.ok"),
- buttonCallback: function() {
- continueTo(addTank);
+ function continueDragMidpoint() {
+ if (!context.hasEntity(woodRoadID) || !context.hasEntity(woodRoadEndID)) {
+ return continueTo(updateLine);
+ }
+ var padding = 100 * Math.pow(2, context.map().zoom() - 19);
+ var box = pad(woodRoadDragEndpoint, padding, context);
+ box.height += 400;
+ var advance = function() {
+ context.history().checkpoint("doneUpdateLine");
+ continueTo(deleteLines);
+ };
+ reveal(
+ box,
+ helpHtml("intro.lines.continue_drag_midpoint"),
+ { buttonText: _t.html("intro.ok"), buttonCallback: advance }
+ );
+ context.map().on("move.intro drawn.intro", function() {
+ if (!context.hasEntity(woodRoadID) || !context.hasEntity(woodRoadEndID)) {
+ return continueTo(updateLine);
}
+ var padding2 = 100 * Math.pow(2, context.map().zoom() - 19);
+ var box2 = pad(woodRoadDragEndpoint, padding2, context);
+ box2.height += 400;
+ reveal(
+ box2,
+ helpHtml("intro.lines.continue_drag_midpoint"),
+ { duration: 0, buttonText: _t.html("intro.ok"), buttonCallback: advance }
+ );
});
function continueTo(nextStep) {
+ context.map().on("move.intro drawn.intro", null);
nextStep();
}
}
- function addTank() {
+ function deleteLines() {
+ context.history().reset("doneUpdateLine");
context.enter(modeBrowse(context));
- context.history().reset("doneSquare");
- _tankID = null;
- var msec = transitionTime(tank, context.map().center());
+ if (!context.hasEntity(washingtonStreetID) || !context.hasEntity(twelfthAvenueID) || !context.hasEntity(eleventhAvenueEndID)) {
+ return chapter.restart();
+ }
+ var msec = transitionTime(deleteLinesLoc, context.map().center());
if (msec) {
reveal(null, null, { duration: 0 });
}
- context.map().centerZoomEase(tank, 19.5, msec);
+ context.map().centerZoomEase(deleteLinesLoc, 18, msec);
timeout2(function() {
- reveal("button.add-area", helpHtml("intro.buildings.add_tank"));
- context.on("enter.intro", function(mode) {
- if (mode.id !== "add-area")
- return;
- continueTo(startTank);
+ var padding = 200 * Math.pow(2, context.map().zoom() - 18);
+ var box = pad(deleteLinesLoc, padding, context);
+ box.top -= 200;
+ box.height += 400;
+ var advance = function() {
+ continueTo(rightClickIntersection);
+ };
+ reveal(
+ box,
+ helpHtml("intro.lines.delete_lines", { street: _t("intro.graph.name.12th-avenue") }),
+ { buttonText: _t.html("intro.ok"), buttonCallback: advance }
+ );
+ context.map().on("move.intro drawn.intro", function() {
+ var padding2 = 200 * Math.pow(2, context.map().zoom() - 18);
+ var box2 = pad(deleteLinesLoc, padding2, context);
+ box2.top -= 200;
+ box2.height += 400;
+ reveal(
+ box2,
+ helpHtml("intro.lines.delete_lines", { street: _t("intro.graph.name.12th-avenue") }),
+ { duration: 0, buttonText: _t.html("intro.ok"), buttonCallback: advance }
+ );
+ });
+ context.history().on("change.intro", function() {
+ timeout2(function() {
+ continueTo(deleteLines);
+ }, 500);
});
}, msec + 100);
function continueTo(nextStep) {
- context.on("enter.intro", null);
+ context.map().on("move.intro drawn.intro", null);
+ context.history().on("change.intro", null);
nextStep();
}
}
- function startTank() {
- if (context.mode().id !== "add-area") {
- return continueTo(addTank);
- }
- _tankID = null;
+ function rightClickIntersection() {
+ context.history().reset("doneUpdateLine");
+ context.enter(modeBrowse(context));
+ context.map().centerZoomEase(eleventhAvenueEnd, 18, 500);
+ var rightClickString = helpHtml("intro.lines.split_street", {
+ street1: _t("intro.graph.name.11th-avenue"),
+ street2: _t("intro.graph.name.washington-street")
+ }) + helpHtml("intro.lines." + (context.lastPointerType() === "mouse" ? "rightclick_intersection" : "edit_menu_intersection_touch"));
timeout2(function() {
- var startString = helpHtml("intro.buildings.start_tank") + helpHtml("intro.buildings.tank_edge_" + (context.lastPointerType() === "mouse" ? "click" : "tap"));
- revealTank(tank, startString);
+ var padding = 60 * Math.pow(2, context.map().zoom() - 18);
+ var box = pad(eleventhAvenueEnd, padding, context);
+ reveal(box, rightClickString);
context.map().on("move.intro drawn.intro", function() {
- revealTank(tank, startString, { duration: 0 });
+ var padding2 = 60 * Math.pow(2, context.map().zoom() - 18);
+ var box2 = pad(eleventhAvenueEnd, padding2, context);
+ reveal(
+ box2,
+ rightClickString,
+ { duration: 0 }
+ );
});
context.on("enter.intro", function(mode) {
- if (mode.id !== "draw-area")
- return chapter.restart();
- continueTo(continueTank);
+ if (mode.id !== "select") return;
+ var ids = context.selectedIDs();
+ if (ids.length !== 1 || ids[0] !== eleventhAvenueEndID) return;
+ timeout2(function() {
+ var node = selectMenuItem(context, "split").node();
+ if (!node) return;
+ continueTo(splitIntersection);
+ }, 50);
});
- }, 550);
+ context.history().on("change.intro", function() {
+ timeout2(function() {
+ continueTo(deleteLines);
+ }, 300);
+ });
+ }, 600);
function continueTo(nextStep) {
context.map().on("move.intro drawn.intro", null);
context.on("enter.intro", null);
+ context.history().on("change.intro", null);
nextStep();
}
}
- function continueTank() {
- if (context.mode().id !== "draw-area") {
- return continueTo(addTank);
+ function splitIntersection() {
+ if (!context.hasEntity(washingtonStreetID) || !context.hasEntity(twelfthAvenueID) || !context.hasEntity(eleventhAvenueEndID)) {
+ return continueTo(deleteLines);
}
- _tankID = null;
- var continueString = helpHtml("intro.buildings.continue_tank") + "{br}" + helpHtml("intro.areas.finish_area_" + (context.lastPointerType() === "mouse" ? "click" : "tap")) + helpHtml("intro.buildings.finish_tank");
- revealTank(tank, continueString);
+ var node = selectMenuItem(context, "split").node();
+ if (!node) {
+ return continueTo(rightClickIntersection);
+ }
+ var wasChanged = false;
+ _washingtonSegmentID = null;
+ reveal(
+ ".edit-menu",
+ helpHtml(
+ "intro.lines.split_intersection",
+ { street: _t("intro.graph.name.washington-street") }
+ ),
+ { padding: 50 }
+ );
context.map().on("move.intro drawn.intro", function() {
- revealTank(tank, continueString, { duration: 0 });
- });
- context.on("enter.intro", function(mode) {
- if (mode.id === "draw-area") {
- return;
- } else if (mode.id === "select") {
- _tankID = context.selectedIDs()[0];
- return continueTo(searchPresetTank);
- } else {
- return continueTo(addTank);
+ var node2 = selectMenuItem(context, "split").node();
+ if (!wasChanged && !node2) {
+ return continueTo(rightClickIntersection);
}
+ reveal(
+ ".edit-menu",
+ helpHtml(
+ "intro.lines.split_intersection",
+ { street: _t("intro.graph.name.washington-street") }
+ ),
+ { duration: 0, padding: 50 }
+ );
+ });
+ context.history().on("change.intro", function(changed) {
+ wasChanged = true;
+ timeout2(function() {
+ if (context.history().undoAnnotation() === _t("operations.split.annotation.line", { n: 1 })) {
+ _washingtonSegmentID = changed.created()[0].id;
+ continueTo(didSplit);
+ } else {
+ _washingtonSegmentID = null;
+ continueTo(retrySplit);
+ }
+ }, 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 searchPresetTank() {
- if (!_tankID || !context.hasEntity(_tankID)) {
- return addTank();
- }
- var ids = context.selectedIDs();
- if (context.mode().id !== "select" || !ids.length || ids[0] !== _tankID) {
- context.enter(modeSelect(context, [_tankID]));
- }
- context.container().select(".inspector-wrap").on("wheel.intro", eventCancel);
- timeout2(function() {
- context.container().select(".inspector-wrap .panewrap").style("right", "-100%");
- context.container().select(".preset-search-input").on("keydown.intro", null).on("keyup.intro", checkPresetSearch);
- reveal(".preset-search-input", helpHtml("intro.buildings.search_tank", { preset: tankPreset.name() }));
- }, 400);
- context.on("enter.intro", function(mode) {
- if (!_tankID || !context.hasEntity(_tankID)) {
- return continueTo(addTank);
- }
- var ids2 = context.selectedIDs();
- if (mode.id !== "select" || !ids2.length || ids2[0] !== _tankID) {
- context.enter(modeSelect(context, [_tankID]));
- context.container().select(".inspector-wrap .panewrap").style("right", "-100%");
- 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.buildings.search_tank", { preset: tankPreset.name() }));
- context.history().on("change.intro", null);
- }
+ function retrySplit() {
+ context.enter(modeBrowse(context));
+ context.map().centerZoomEase(eleventhAvenueEnd, 18, 500);
+ var advance = function() {
+ continueTo(rightClickIntersection);
+ };
+ var padding = 60 * Math.pow(2, context.map().zoom() - 18);
+ var box = pad(eleventhAvenueEnd, padding, context);
+ reveal(
+ box,
+ helpHtml("intro.lines.retry_split"),
+ { buttonText: _t.html("intro.ok"), buttonCallback: advance }
+ );
+ context.map().on("move.intro drawn.intro", function() {
+ var padding2 = 60 * Math.pow(2, context.map().zoom() - 18);
+ var box2 = pad(eleventhAvenueEnd, padding2, context);
+ reveal(
+ box2,
+ helpHtml("intro.lines.retry_split"),
+ { duration: 0, buttonText: _t.html("intro.ok"), buttonCallback: advance }
+ );
});
- function checkPresetSearch() {
- var first = context.container().select(".preset-list-item:first-child");
- if (first.classed("preset-man_made-storage_tank")) {
- reveal(first.select(".preset-list-button").node(), helpHtml("intro.buildings.choose_tank", { preset: tankPreset.name() }), { duration: 300 });
- context.container().select(".preset-search-input").on("keydown.intro", eventCancel, true).on("keyup.intro", null);
- context.history().on("change.intro", function() {
- continueTo(closeEditorTank);
- });
- }
- }
function continueTo(nextStep) {
- context.container().select(".inspector-wrap").on("wheel.intro", null);
- context.on("enter.intro", null);
- context.history().on("change.intro", null);
- context.container().select(".preset-search-input").on("keydown.intro keyup.intro", null);
+ context.map().on("move.intro drawn.intro", null);
nextStep();
}
}
- function closeEditorTank() {
- if (!_tankID || !context.hasEntity(_tankID)) {
- return addTank();
+ function didSplit() {
+ if (!_washingtonSegmentID || !context.hasEntity(_washingtonSegmentID) || !context.hasEntity(washingtonStreetID) || !context.hasEntity(twelfthAvenueID) || !context.hasEntity(eleventhAvenueEndID)) {
+ return continueTo(rightClickIntersection);
}
var ids = context.selectedIDs();
- if (context.mode().id !== "select" || !ids.length || ids[0] !== _tankID) {
- context.enter(modeSelect(context, [_tankID]));
- }
- context.history().checkpoint("hasTank");
- context.on("exit.intro", function() {
- continueTo(rightClickTank);
- });
+ var string = "intro.lines.did_split_" + (ids.length > 1 ? "multi" : "single");
+ var street = _t("intro.graph.name.washington-street");
+ var padding = 200 * Math.pow(2, context.map().zoom() - 18);
+ var box = pad(twelfthAvenue, padding, context);
+ box.width = box.width / 2;
+ reveal(
+ box,
+ helpHtml(string, { street1: street, street2: street }),
+ { duration: 500 }
+ );
timeout2(function() {
- reveal(".entity-editor-pane", helpHtml("intro.buildings.close", { button: { html: icon("#iD-icon-close", "inline") } }));
- }, 500);
+ context.map().centerZoomEase(twelfthAvenue, 18, 500);
+ context.map().on("move.intro drawn.intro", function() {
+ var padding2 = 200 * Math.pow(2, context.map().zoom() - 18);
+ var box2 = pad(twelfthAvenue, padding2, context);
+ box2.width = box2.width / 2;
+ reveal(
+ box2,
+ helpHtml(string, { street1: street, street2: street }),
+ { duration: 0 }
+ );
+ });
+ }, 600);
+ context.on("enter.intro", function() {
+ var ids2 = context.selectedIDs();
+ if (ids2.length === 1 && ids2[0] === _washingtonSegmentID) {
+ continueTo(multiSelect2);
+ }
+ });
+ context.history().on("change.intro", function() {
+ if (!_washingtonSegmentID || !context.hasEntity(_washingtonSegmentID) || !context.hasEntity(washingtonStreetID) || !context.hasEntity(twelfthAvenueID) || !context.hasEntity(eleventhAvenueEndID)) {
+ return continueTo(rightClickIntersection);
+ }
+ });
function continueTo(nextStep) {
- context.on("exit.intro", null);
+ context.map().on("move.intro drawn.intro", null);
+ context.on("enter.intro", null);
+ context.history().on("change.intro", null);
nextStep();
}
}
- function rightClickTank() {
- if (!_tankID)
- return continueTo(addTank);
- context.enter(modeBrowse(context));
- context.history().reset("hasTank");
- context.map().centerEase(tank, 500);
+ function multiSelect2() {
+ if (!_washingtonSegmentID || !context.hasEntity(_washingtonSegmentID) || !context.hasEntity(washingtonStreetID) || !context.hasEntity(twelfthAvenueID) || !context.hasEntity(eleventhAvenueEndID)) {
+ return continueTo(rightClickIntersection);
+ }
+ var ids = context.selectedIDs();
+ var hasWashington = ids.indexOf(_washingtonSegmentID) !== -1;
+ var hasTwelfth = ids.indexOf(twelfthAvenueID) !== -1;
+ if (hasWashington && hasTwelfth) {
+ return continueTo(multiRightClick);
+ } else if (!hasWashington && !hasTwelfth) {
+ return continueTo(didSplit);
+ }
+ context.map().centerZoomEase(twelfthAvenue, 18, 500);
timeout2(function() {
- context.on("enter.intro", function(mode) {
- if (mode.id !== "select")
- return;
- var ids = context.selectedIDs();
- if (ids.length !== 1 || ids[0] !== _tankID)
- return;
- timeout2(function() {
- var node = selectMenuItem(context, "circularize").node();
- if (!node)
- return;
- continueTo(clickCircle);
- }, 50);
- });
- var rightclickString = helpHtml("intro.buildings." + (context.lastPointerType() === "mouse" ? "rightclick_tank" : "edit_menu_tank_touch"));
- revealTank(tank, rightclickString);
+ var selected, other2, padding, box;
+ if (hasWashington) {
+ selected = _t("intro.graph.name.washington-street");
+ other2 = _t("intro.graph.name.12th-avenue");
+ padding = 60 * Math.pow(2, context.map().zoom() - 18);
+ box = pad(twelfthAvenueEnd, padding, context);
+ box.width *= 3;
+ } else {
+ selected = _t("intro.graph.name.12th-avenue");
+ other2 = _t("intro.graph.name.washington-street");
+ padding = 200 * Math.pow(2, context.map().zoom() - 18);
+ box = pad(twelfthAvenue, padding, context);
+ box.width /= 2;
+ }
+ reveal(
+ box,
+ helpHtml(
+ "intro.lines.multi_select",
+ { selected, other1: other2 }
+ ) + " " + helpHtml(
+ "intro.lines.add_to_selection_" + (context.lastPointerType() === "mouse" ? "click" : "touch"),
+ { selected, other2 }
+ )
+ );
context.map().on("move.intro drawn.intro", function() {
- revealTank(tank, rightclickString, { duration: 0 });
+ if (hasWashington) {
+ selected = _t("intro.graph.name.washington-street");
+ other2 = _t("intro.graph.name.12th-avenue");
+ padding = 60 * Math.pow(2, context.map().zoom() - 18);
+ box = pad(twelfthAvenueEnd, padding, context);
+ box.width *= 3;
+ } else {
+ selected = _t("intro.graph.name.12th-avenue");
+ other2 = _t("intro.graph.name.washington-street");
+ padding = 200 * Math.pow(2, context.map().zoom() - 18);
+ box = pad(twelfthAvenue, padding, context);
+ box.width /= 2;
+ }
+ reveal(
+ box,
+ helpHtml(
+ "intro.lines.multi_select",
+ { selected, other1: other2 }
+ ) + " " + helpHtml(
+ "intro.lines.add_to_selection_" + (context.lastPointerType() === "mouse" ? "click" : "touch"),
+ { selected, other2 }
+ ),
+ { duration: 0 }
+ );
+ });
+ context.on("enter.intro", function() {
+ continueTo(multiSelect2);
});
context.history().on("change.intro", function() {
- continueTo(rightClickTank);
+ if (!_washingtonSegmentID || !context.hasEntity(_washingtonSegmentID) || !context.hasEntity(washingtonStreetID) || !context.hasEntity(twelfthAvenueID) || !context.hasEntity(eleventhAvenueEndID)) {
+ return continueTo(rightClickIntersection);
+ }
});
}, 600);
function continueTo(nextStep) {
+ context.map().on("move.intro drawn.intro", null);
context.on("enter.intro", null);
+ context.history().on("change.intro", null);
+ nextStep();
+ }
+ }
+ function multiRightClick() {
+ if (!_washingtonSegmentID || !context.hasEntity(_washingtonSegmentID) || !context.hasEntity(washingtonStreetID) || !context.hasEntity(twelfthAvenueID) || !context.hasEntity(eleventhAvenueEndID)) {
+ return continueTo(rightClickIntersection);
+ }
+ var padding = 200 * Math.pow(2, context.map().zoom() - 18);
+ var box = pad(twelfthAvenue, padding, context);
+ var rightClickString = helpHtml("intro.lines.multi_select_success") + helpHtml("intro.lines.multi_" + (context.lastPointerType() === "mouse" ? "rightclick" : "edit_menu_touch"));
+ reveal(box, rightClickString);
+ context.map().on("move.intro drawn.intro", function() {
+ var padding2 = 200 * Math.pow(2, context.map().zoom() - 18);
+ var box2 = pad(twelfthAvenue, padding2, context);
+ reveal(box2, rightClickString, { duration: 0 });
+ });
+ context.ui().editMenu().on("toggled.intro", function(open) {
+ 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;
+ continueTo(multiDelete);
+ } else if (ids.length === 1 && ids.indexOf(_washingtonSegmentID) !== -1) {
+ return continueTo(multiSelect2);
+ } else {
+ return continueTo(didSplit);
+ }
+ }, 300);
+ });
+ context.history().on("change.intro", function() {
+ if (!_washingtonSegmentID || !context.hasEntity(_washingtonSegmentID) || !context.hasEntity(washingtonStreetID) || !context.hasEntity(twelfthAvenueID) || !context.hasEntity(eleventhAvenueEndID)) {
+ return continueTo(rightClickIntersection);
+ }
+ });
+ function continueTo(nextStep) {
context.map().on("move.intro drawn.intro", null);
+ context.ui().editMenu().on("toggled.intro", null);
context.history().on("change.intro", null);
nextStep();
}
}
- function clickCircle() {
- if (!_tankID)
- return chapter.restart();
- var entity = context.hasEntity(_tankID);
- if (!entity)
- return continueTo(rightClickTank);
- var node = selectMenuItem(context, "circularize").node();
- if (!node) {
- return continueTo(rightClickTank);
+ function multiDelete() {
+ if (!_washingtonSegmentID || !context.hasEntity(_washingtonSegmentID) || !context.hasEntity(washingtonStreetID) || !context.hasEntity(twelfthAvenueID) || !context.hasEntity(eleventhAvenueEndID)) {
+ return continueTo(rightClickIntersection);
}
- var wasChanged = false;
- reveal(".edit-menu", helpHtml("intro.buildings.circle_tank"), { padding: 50 });
- context.on("enter.intro", function(mode) {
- if (mode.id === "browse") {
- continueTo(rightClickTank);
- } else if (mode.id === "move" || mode.id === "rotate") {
- continueTo(retryClickCircle);
+ var node = selectMenuItem(context, "delete").node();
+ if (!node) return continueTo(multiRightClick);
+ reveal(
+ ".edit-menu",
+ helpHtml("intro.lines.multi_delete"),
+ { padding: 50 }
+ );
+ context.map().on("move.intro drawn.intro", function() {
+ if (selectMenuItem(context, "delete").empty()) {
+ return continueTo(multiRightClick);
}
+ reveal(
+ ".edit-menu",
+ helpHtml("intro.lines.multi_delete"),
+ { duration: 0, padding: 50 }
+ );
});
- context.map().on("move.intro", function() {
- var node2 = selectMenuItem(context, "circularize").node();
- if (!wasChanged && !node2) {
- return continueTo(rightClickTank);
+ context.on("exit.intro", function() {
+ if (context.hasEntity(_washingtonSegmentID) || context.hasEntity(twelfthAvenueID)) {
+ return continueTo(multiSelect2);
}
- reveal(".edit-menu", helpHtml("intro.buildings.circle_tank"), { duration: 0, padding: 50 });
});
context.history().on("change.intro", function() {
- wasChanged = true;
- context.history().on("change.intro", null);
- timeout2(function() {
- if (context.history().undoAnnotation() === _t("operations.circularize.annotation.feature", { n: 1 })) {
- continueTo(play);
- } else {
- continueTo(retryClickCircle);
- }
- }, 500);
+ if (context.hasEntity(_washingtonSegmentID) || context.hasEntity(twelfthAvenueID)) {
+ continueTo(retryDelete);
+ } else {
+ continueTo(play);
+ }
});
function continueTo(nextStep) {
- context.on("enter.intro", null);
- context.map().on("move.intro", null);
+ context.map().on("move.intro drawn.intro", null);
+ context.on("exit.intro", null);
context.history().on("change.intro", null);
nextStep();
}
}
- function retryClickCircle() {
+ function retryDelete() {
context.enter(modeBrowse(context));
- revealTank(tank, helpHtml("intro.buildings.retry_circle"), {
+ var padding = 200 * Math.pow(2, context.map().zoom() - 18);
+ var box = pad(twelfthAvenue, padding, context);
+ reveal(box, helpHtml("intro.lines.retry_delete"), {
buttonText: _t.html("intro.ok"),
buttonCallback: function() {
- continueTo(rightClickTank);
+ continueTo(multiSelect2);
}
});
function continueTo(nextStep) {
@@ -54910,13094 +59525,15035 @@ ${content}
}
}
function play() {
- dispatch10.call("done");
- reveal(".ideditor", helpHtml("intro.buildings.play", { next: _t("intro.startediting.title") }), {
- tooltipBox: ".intro-nav-wrap .chapter-startEditing",
- buttonText: _t.html("intro.ok"),
- buttonCallback: function() {
- reveal(".ideditor");
+ dispatch14.call("done");
+ reveal(
+ ".ideditor",
+ helpHtml("intro.lines.play", { next: _t("intro.buildings.title") }),
+ {
+ tooltipBox: ".intro-nav-wrap .chapter-building",
+ buttonText: _t.html("intro.ok"),
+ buttonCallback: function() {
+ reveal(".ideditor");
+ }
}
- });
+ );
}
chapter.enter = function() {
- addHouse();
+ addLine();
};
chapter.exit = function() {
timeouts.forEach(window.clearTimeout);
+ select_default2(window).on("pointerdown.intro mousedown.intro", null, true);
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(".preset-search-input").on("keydown.intro keyup.intro", null);
- context.container().select(".more-fields .combobox-input").on("click.intro", null);
+ context.container().select(".preset-list-button").on("click.intro", null);
};
chapter.restart = function() {
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 modalSelection = select_default2(null);
+ // modules/ui/intro/building.js
+ function uiIntroBuilding(context, reveal) {
+ var dispatch14 = dispatch_default("done");
+ var house = [-85.62815, 41.95638];
+ var tank = [-85.62732, 41.95347];
+ var buildingCatetory = _mainPresetIndex.item("category-building");
+ var housePreset = _mainPresetIndex.item("building/house");
+ var tankPreset = _mainPresetIndex.item("man_made/storage_tank");
+ var timeouts = [];
+ var _houseID = null;
+ var _tankID = null;
var chapter = {
- title: "intro.startediting.title"
+ title: "intro.buildings.title"
};
- function showHelp() {
- reveal(".map-control.help-control", helpHtml("intro.startediting.help"), {
- buttonText: _t.html("intro.ok"),
- buttonCallback: function() {
- shortcuts();
- }
- });
- }
- function shortcuts() {
- reveal(".map-control.help-control", helpHtml("intro.startediting.shortcuts"), {
- buttonText: _t.html("intro.ok"),
- buttonCallback: function() {
- showSave();
- }
- });
+ function timeout2(f2, t2) {
+ timeouts.push(window.setTimeout(f2, t2));
}
- function showSave() {
- context.container().selectAll(".shaded").remove();
- reveal(".top-toolbar button.save", helpHtml("intro.startediting.save"), {
- buttonText: _t.html("intro.ok"),
- buttonCallback: function() {
- showStart();
- }
- });
+ function eventCancel(d3_event) {
+ d3_event.stopPropagation();
+ d3_event.preventDefault();
}
- function showStart() {
- context.container().selectAll(".shaded").remove();
- modalSelection = uiModal(context.container());
- modalSelection.select(".modal").attr("class", "modal-splash modal");
- modalSelection.selectAll(".close").remove();
- var startbutton = modalSelection.select(".content").attr("class", "fillL").append("button").attr("class", "modal-section huge-modal-button").on("click", function() {
- modalSelection.remove();
- });
- 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");
+ function revealHouse(center, text, options2) {
+ var padding = 160 * Math.pow(2, context.map().zoom() - 20);
+ var box = pad(center, padding, context);
+ reveal(box, text, options2);
}
- chapter.enter = function() {
- showHelp();
- };
- chapter.exit = function() {
- modalSelection.remove();
- context.container().selectAll(".shaded").remove();
- };
- return utilRebind(chapter, dispatch10, "on");
- }
-
- // modules/ui/intro/intro.js
- var chapterUi = {
- welcome: uiIntroWelcome,
- navigation: uiIntroNavigation,
- point: uiIntroPoint,
- area: uiIntroArea,
- line: uiIntroLine,
- building: uiIntroBuilding,
- startEditing: uiIntroStartEditing
- };
- var chapterFlow = [
- "welcome",
- "navigation",
- "point",
- "area",
- "line",
- "building",
- "startEditing"
- ];
- function uiIntro(context) {
- const INTRO_IMAGERY = "EsriWorldImageryClarity";
- let _introGraph = {};
- let _currChapter;
- function intro(selection2) {
- _mainFileFetcher.get("intro_graph").then((dataIntroGraph) => {
- for (let id2 in dataIntroGraph) {
- if (!_introGraph[id2]) {
- _introGraph[id2] = osmEntity(localize(dataIntroGraph[id2]));
- }
- }
- selection2.call(startIntro);
- }).catch(function() {
- });
+ function revealTank(center, text, options2) {
+ var padding = 190 * Math.pow(2, context.map().zoom() - 19.5);
+ var box = pad(center, padding, context);
+ reveal(box, text, options2);
}
- function startIntro(selection2) {
+ function addHouse() {
context.enter(modeBrowse(context));
- let osm = context.connection();
- let history = context.history().toJSON();
- let hash = window.location.hash;
- let center = context.map().center();
- let zoom = context.map().zoom();
- let background = context.background().baseLayerSource();
- let overlays = context.background().overlayLayerSources();
- let opacity = context.container().selectAll(".main-map .layer-background").style("opacity");
- let caches = osm && osm.caches();
- let baseEntities = context.history().graph().base().entities;
- context.ui().sidebar.expand();
- context.container().selectAll("button.sidebar-toggle").classed("disabled", true);
- context.inIntro(true);
- if (osm) {
- osm.toggle(false).reset();
- }
- context.history().reset();
- context.history().merge(Object.values(coreGraph().load(_introGraph).entities));
- context.history().checkpoint("initial");
- let imagery = context.background().findSource(INTRO_IMAGERY);
- if (imagery) {
- context.background().baseLayerSource(imagery);
- } else {
- context.background().bing();
+ context.history().reset("initial");
+ _houseID = null;
+ var msec = transitionTime(house, context.map().center());
+ if (msec) {
+ reveal(null, null, { duration: 0 });
}
- overlays.forEach((d) => context.background().toggleOverlayLayer(d));
- let layers = context.layers();
- layers.all().forEach((item) => {
- if (typeof item.layer.enabled === "function") {
- item.layer.enabled(item.id === "osm");
- }
- });
- context.container().selectAll(".main-map .layer-background").style("opacity", 1);
- let curtain = uiCurtain(context.container().node());
- selection2.call(curtain);
- 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);
- }
- progress.push(chapter);
- corePreferences("walkthrough_progress", utilArrayUniq(progress).join(";"));
+ context.map().centerZoomEase(house, 19, msec);
+ timeout2(function() {
+ var tooltip = reveal(
+ "button.add-area",
+ helpHtml("intro.buildings.add_building")
+ );
+ 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;
+ continueTo(startHouse);
});
- return s;
- });
- chapters[chapters.length - 1].on("startEditing", () => {
- progress.push("startEditing");
- corePreferences("walkthrough_progress", utilArrayUniq(progress).join(";"));
- let incomplete = utilArrayDifference(chapterFlow, progress);
- if (!incomplete.length) {
- corePreferences("walkthrough_completed", "yes");
- }
- curtain.remove();
- navwrap.remove();
- context.container().selectAll(".main-map .layer-background").style("opacity", opacity);
- context.container().selectAll("button.sidebar-toggle").classed("disabled", false);
- if (osm) {
- osm.toggle(true).reset().caches(caches);
- }
- context.history().reset().merge(Object.values(baseEntities));
- context.background().baseLayerSource(background);
- overlays.forEach((d) => context.background().toggleOverlayLayer(d));
- if (history) {
- context.history().fromJSON(history, false);
- }
- context.map().centerZoom(center, zoom);
- window.location.replace(hash);
- context.inIntro(false);
- });
- 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));
- 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) {
- if (_currChapter) {
- _currChapter.exit();
- }
- context.enter(modeBrowse(context));
- _currChapter = newChapter;
- _currChapter.enter();
- buttons.classed("next", false).classed("active", (d) => d.title === _currChapter.title);
- }
- }
- return intro;
- }
-
- // modules/ui/issues_info.js
- function uiIssuesInfo(context) {
- var warningsItem = {
- id: "warnings",
- count: 0,
- iconID: "iD-icon-alert",
- descriptionID: "issues.warnings_and_errors"
- };
- var resolvedItem = {
- id: "resolved",
- count: 0,
- iconID: "iD-icon-apply",
- descriptionID: "issues.user_resolved_issues"
- };
- function update(selection2) {
- var shownItems = [];
- var liveIssues = context.validator().getIssues({
- what: corePreferences("validate-what") || "edited",
- where: corePreferences("validate-where") || "all"
- });
- if (liveIssues.length) {
- warningsItem.count = liveIssues.length;
- shownItems.push(warningsItem);
- }
- if (corePreferences("validate-what") === "all") {
- var resolvedIssues = context.validator().getResolvedIssues();
- if (resolvedIssues.length) {
- resolvedItem.count = resolvedIssues.length;
- shownItems.push(resolvedItem);
- }
+ }, msec + 100);
+ function continueTo(nextStep) {
+ context.on("enter.intro", null);
+ nextStep();
}
- var chips = selection2.selectAll(".chip").data(shownItems, function(d) {
- return d.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 chipSelection = select_default2(this);
- var tooltipBehavior = uiTooltip().placement("top").title(_t.html(d.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));
- });
- enter.append("span").attr("class", "count");
- enter.merge(chips).selectAll("span.count").text(function(d) {
- return d.count.toString();
- });
}
- return function(selection2) {
- update(selection2);
- context.validator().on("validated.infobox", function() {
- update(selection2);
- });
- };
- }
-
- // 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();
- }
- function zoomEnded() {
- if (_skipEvents)
- return;
- if (_gesture !== "pan")
- return;
- updateProjection();
- _gesture = null;
- context.map().center(projection2.invert(_cMini));
- }
- function updateProjection() {
- var loc = context.map().center();
- var tMain = context.projection.transform();
- var zMain = geoScaleToZoom(tMain.k);
- var zMini = Math.max(zMain - _zDiff, 0.5);
- var kMini = geoZoomToScale(zMini);
- projection2.translate([tMain.x, tMain.y]).scale(kMini);
- var point = projection2(loc);
- var mouse = _gesture === "pan" ? geoVecSubtract([_tCurr.x, _tCurr.y], [_tStart.x, _tStart.y]) : [0, 0];
- var xMini = _cMini[0] - point[0] + tMain.x + mouse[0];
- var yMini = _cMini[1] - point[1] + tMain.y + mouse[1];
- projection2.translate([xMini, yMini]).clipExtent([[0, 0], _dMini]);
- _tCurr = projection2.transform();
- if (_isTransformed) {
- utilSetTransform(tiles, 0, 0);
- utilSetTransform(viewport, 0, 0);
- _isTransformed = false;
- }
- zoom.scaleExtent([geoZoomToScale(0.5), geoZoomToScale(zMain - 3)]);
- _skipEvents = true;
- wrap2.call(zoom.transform, _tCurr);
- _skipEvents = false;
+ function startHouse() {
+ if (context.mode().id !== "add-area") {
+ return continueTo(addHouse);
}
- function redraw() {
- clearTimeout(_timeoutID);
- if (_isHidden)
- return;
- updateProjection();
- var zMini = geoScaleToZoom(projection2.scale());
- tiles = wrap2.selectAll(".map-in-map-tiles").data([0]);
- tiles = tiles.enter().append("div").attr("class", "map-in-map-tiles").merge(tiles);
- backgroundLayer.source(context.background().baseLayerSource()).projection(projection2).dimensions(_dMini);
- var background = tiles.selectAll(".map-in-map-background").data([0]);
- background.enter().append("div").attr("class", "map-in-map-background").merge(background).call(backgroundLayer);
- var overlaySources = context.background().overlayLayerSources();
- var activeOverlayLayers = [];
- for (var i2 = 0; i2 < overlaySources.length; i2++) {
- if (overlaySources[i2].validZoom(zMini)) {
- if (!overlayLayers[i2])
- overlayLayers[i2] = rendererTileLayer(context);
- activeOverlayLayers.push(overlayLayers[i2].source(overlaySources[i2]).projection(projection2).dimensions(_dMini));
- }
- }
- var overlay = tiles.selectAll(".map-in-map-overlay").data([0]);
- overlay = overlay.enter().append("div").attr("class", "map-in-map-overlay").merge(overlay);
- var overlays = overlay.selectAll("div").data(activeOverlayLayers, function(d) {
- return d.source().name();
- });
- overlays.exit().remove();
- overlays = overlays.enter().append("div").merge(overlays).each(function(layer) {
- select_default2(this).call(layer);
- });
- var dataLayers = tiles.selectAll(".map-in-map-data").data([0]);
- dataLayers.exit().remove();
- dataLayers = dataLayers.enter().append("svg").attr("class", "map-in-map-data").merge(dataLayers).call(dataLayer).call(debugLayer);
- if (_gesture !== "pan") {
- var getPath = path_default(projection2);
- var bbox = { type: "Polygon", coordinates: [context.map().extent().polygon()] };
- viewport = wrap2.selectAll(".map-in-map-viewport").data([0]);
- viewport = viewport.enter().append("svg").attr("class", "map-in-map-viewport").merge(viewport);
- var path = viewport.selectAll(".map-in-map-bbox").data([bbox]);
- path.enter().append("path").attr("class", "map-in-map-bbox").merge(path).attr("d", getPath).classed("thick", function(d) {
- return getPath.area(d) < 30;
- });
- }
+ _houseID = null;
+ context.map().zoomEase(20, 500);
+ timeout2(function() {
+ var startString = helpHtml("intro.buildings.start_building") + helpHtml("intro.buildings.building_corner_" + (context.lastPointerType() === "mouse" ? "click" : "tap"));
+ revealHouse(house, startString);
+ context.map().on("move.intro drawn.intro", function() {
+ revealHouse(house, startString, { duration: 0 });
+ });
+ context.on("enter.intro", function(mode) {
+ if (mode.id !== "draw-area") return chapter.restart();
+ continueTo(continueHouse);
+ });
+ }, 550);
+ function continueTo(nextStep) {
+ context.map().on("move.intro drawn.intro", null);
+ context.on("enter.intro", null);
+ nextStep();
}
- function queueRedraw() {
- clearTimeout(_timeoutID);
- _timeoutID = setTimeout(function() {
- redraw();
- }, 750);
+ }
+ function continueHouse() {
+ if (context.mode().id !== "draw-area") {
+ return continueTo(addHouse);
}
- function toggle(d3_event) {
- if (d3_event)
- d3_event.preventDefault();
- _isHidden = !_isHidden;
- context.container().select(".minimap-toggle-item").classed("active", !_isHidden).select("input").property("checked", !_isHidden);
- if (_isHidden) {
- wrap2.style("display", "block").style("opacity", "1").transition().duration(200).style("opacity", "0").on("end", function() {
- selection2.selectAll(".map-in-map").style("display", "none");
+ _houseID = null;
+ var continueString = helpHtml("intro.buildings.continue_building") + "{br}" + helpHtml("intro.areas.finish_area_" + (context.lastPointerType() === "mouse" ? "click" : "tap")) + helpHtml("intro.buildings.finish_building");
+ revealHouse(house, continueString);
+ context.map().on("move.intro drawn.intro", function() {
+ revealHouse(house, continueString, { duration: 0 });
+ });
+ context.on("enter.intro", function(mode) {
+ if (mode.id === "draw-area") {
+ return;
+ } else if (mode.id === "select") {
+ var graph = context.graph();
+ var way = context.entity(context.selectedIDs()[0]);
+ var nodes = graph.childNodes(way);
+ var points = utilArrayUniq(nodes).map(function(n3) {
+ return context.projection(n3.loc);
});
+ if (isMostlySquare(points)) {
+ _houseID = way.id;
+ return continueTo(chooseCategoryBuilding);
+ } else {
+ return continueTo(retryHouse);
+ }
} else {
- wrap2.style("display", "block").style("opacity", "0").transition().duration(200).style("opacity", "1").on("end", function() {
- redraw();
- });
- }
- }
- uiMapInMap.toggle = toggle;
- wrap2 = selection2.selectAll(".map-in-map").data([0]);
- wrap2 = wrap2.enter().append("div").attr("class", "map-in-map").style("display", _isHidden ? "none" : "block").call(zoom).on("dblclick.zoom", null).merge(wrap2);
- _dMini = [200, 150];
- _cMini = geoVecScale(_dMini, 0.5);
- context.map().on("drawn.map-in-map", function(drawn) {
- if (drawn.full === true) {
- redraw();
+ return chapter.restart();
}
});
- redraw();
- context.keybinding().on(_t("background.minimap.key"), toggle);
+ function continueTo(nextStep) {
+ context.map().on("move.intro drawn.intro", null);
+ context.on("enter.intro", null);
+ nextStep();
+ }
}
- return mapInMap;
- }
-
- // modules/ui/notice.js
- function uiNotice(context) {
- return function(selection2) {
- var div = selection2.append("div").attr("class", "notice");
- var button = div.append("button").attr("class", "zoom-to notice fillD").on("click", function() {
- context.map().zoomEase(context.minEditableZoom());
- }).on("wheel", function(d3_event) {
- var e22 = new WheelEvent(d3_event.type, d3_event);
- context.surface().node().dispatchEvent(e22);
+ function retryHouse() {
+ var onClick = function() {
+ continueTo(addHouse);
+ };
+ revealHouse(
+ house,
+ helpHtml("intro.buildings.retry_building"),
+ { buttonText: _t.html("intro.ok"), buttonCallback: onClick }
+ );
+ context.map().on("move.intro drawn.intro", function() {
+ revealHouse(
+ house,
+ helpHtml("intro.buildings.retry_building"),
+ { duration: 0, buttonText: _t.html("intro.ok"), buttonCallback: onClick }
+ );
});
- button.call(svgIcon("#iD-icon-plus", "pre-text")).append("span").attr("class", "label").call(_t.append("zoom_in_edit"));
- function disableTooHigh() {
- var canEdit = context.map().zoom() >= context.minEditableZoom();
- div.style("display", canEdit ? "none" : "block");
+ function continueTo(nextStep) {
+ context.map().on("move.intro drawn.intro", null);
+ nextStep();
}
- context.map().on("move.notice", debounce_default(disableTooHigh, 500));
- disableTooHigh();
- };
- }
-
- // modules/ui/photoviewer.js
- function uiPhotoviewer(context) {
- var dispatch10 = dispatch_default("resize");
- var _pointerPrefix = "PointerEvent" in window ? "pointer" : "mouse";
- function photoviewer(selection2) {
- selection2.append("button").attr("class", "thumb-hide").attr("title", _t("icons.close")).on("click", function() {
- if (services.streetside) {
- services.streetside.hideViewer(context);
- }
- if (services.mapillary) {
- services.mapillary.hideViewer(context);
- }
- if (services.kartaview) {
- services.kartaview.hideViewer(context);
- }
- }).append("div").call(svgIcon("#iD-icon-close"));
- function preventDefault(d3_event) {
- d3_event.preventDefault();
+ }
+ function chooseCategoryBuilding() {
+ if (!_houseID || !context.hasEntity(_houseID)) {
+ return addHouse();
}
- selection2.append("button").attr("class", "resize-handle-xy").on("touchstart touchdown touchend", preventDefault).on(_pointerPrefix + "down", buildResizeListener(selection2, "resize", dispatch10, { resizeOnX: true, resizeOnY: true }));
- selection2.append("button").attr("class", "resize-handle-x").on("touchstart touchdown touchend", preventDefault).on(_pointerPrefix + "down", buildResizeListener(selection2, "resize", dispatch10, { resizeOnX: true }));
- selection2.append("button").attr("class", "resize-handle-y").on("touchstart touchdown touchend", preventDefault).on(_pointerPrefix + "down", buildResizeListener(selection2, "resize", dispatch10, { resizeOnY: true }));
- function buildResizeListener(target, eventName, dispatch11, options2) {
- var resizeOnX = !!options2.resizeOnX;
- var resizeOnY = !!options2.resizeOnY;
- var minHeight = options2.minHeight || 240;
- var minWidth = options2.minWidth || 320;
- var pointerId;
- var startX;
- var startY;
- var startWidth;
- var startHeight;
- function startResize(d3_event) {
- if (pointerId !== (d3_event.pointerId || "mouse"))
- return;
- d3_event.preventDefault();
- d3_event.stopPropagation();
- var mapSize = context.map().dimensions();
- if (resizeOnX) {
- var maxWidth = mapSize[0];
- var newWidth = clamp3(startWidth + d3_event.clientX - startX, minWidth, maxWidth);
- target.style("width", newWidth + "px");
- }
- if (resizeOnY) {
- var maxHeight = mapSize[1] - 90;
- var newHeight = clamp3(startHeight + startY - d3_event.clientY, minHeight, maxHeight);
- target.style("height", newHeight + "px");
- }
- dispatch11.call(eventName, target, utilGetDimensions(target, true));
- }
- function clamp3(num, min3, max3) {
- return Math.max(min3, Math.min(num, max3));
+ var ids = context.selectedIDs();
+ if (context.mode().id !== "select" || !ids.length || ids[0] !== _houseID) {
+ context.enter(modeSelect(context, [_houseID]));
+ }
+ context.container().select(".inspector-wrap").on("wheel.intro", eventCancel);
+ timeout2(function() {
+ context.container().select(".inspector-wrap .panewrap").style("right", "-100%");
+ var button = context.container().select(".preset-category-building .preset-list-button");
+ reveal(
+ button.node(),
+ helpHtml("intro.buildings.choose_category_building", { category: buildingCatetory.name() })
+ );
+ button.on("click.intro", function() {
+ button.on("click.intro", null);
+ continueTo(choosePresetHouse);
+ });
+ }, 400);
+ context.on("enter.intro", function(mode) {
+ if (!_houseID || !context.hasEntity(_houseID)) {
+ return continueTo(addHouse);
}
- function stopResize(d3_event) {
- if (pointerId !== (d3_event.pointerId || "mouse"))
- return;
- d3_event.preventDefault();
- d3_event.stopPropagation();
- select_default2(window).on("." + eventName, null);
+ var ids2 = context.selectedIDs();
+ if (mode.id !== "select" || !ids2.length || ids2[0] !== _houseID) {
+ return continueTo(chooseCategoryBuilding);
}
- return function initResize(d3_event) {
- d3_event.preventDefault();
- d3_event.stopPropagation();
- pointerId = d3_event.pointerId || "mouse";
- startX = d3_event.clientX;
- startY = d3_event.clientY;
- var targetRect = target.node().getBoundingClientRect();
- startWidth = targetRect.width;
- startHeight = targetRect.height;
- select_default2(window).on(_pointerPrefix + "move." + eventName, startResize, false).on(_pointerPrefix + "up." + eventName, stopResize, false);
- if (_pointerPrefix === "pointer") {
- select_default2(window).on("pointercancel." + eventName, stopResize, false);
- }
- };
+ });
+ function continueTo(nextStep) {
+ context.container().select(".inspector-wrap").on("wheel.intro", null);
+ context.container().select(".preset-list-button").on("click.intro", null);
+ context.on("enter.intro", null);
+ nextStep();
}
}
- photoviewer.onMapResize = function() {
- var photoviewer2 = context.container().select(".photoviewer");
- var content = context.container().select(".main-content");
- var mapDimensions = utilGetDimensions(content, true);
- var photoDimensions = utilGetDimensions(photoviewer2, true);
- if (photoDimensions[0] > mapDimensions[0] || photoDimensions[1] > mapDimensions[1] - 90) {
- var setPhotoDimensions = [
- Math.min(photoDimensions[0], mapDimensions[0]),
- Math.min(photoDimensions[1], mapDimensions[1] - 90)
- ];
- photoviewer2.style("width", setPhotoDimensions[0] + "px").style("height", setPhotoDimensions[1] + "px");
- dispatch10.call("resize", photoviewer2, setPhotoDimensions);
+ function choosePresetHouse() {
+ if (!_houseID || !context.hasEntity(_houseID)) {
+ return addHouse();
}
- };
- return utilRebind(photoviewer, dispatch10, "on");
- }
-
- // modules/ui/restore.js
- function uiRestore(context) {
- return function(selection2) {
- if (!context.history().hasRestorableChanges())
- return;
- let modalSelection = uiModal(selection2, true);
- modalSelection.select(".modal").attr("class", "modal fillL");
- let introModal = modalSelection.select(".content");
- introModal.append("div").attr("class", "modal-section").append("h3").call(_t.append("restore.heading"));
- introModal.append("div").attr("class", "modal-section").append("p").call(_t.append("restore.description"));
- let buttonWrap = introModal.append("div").attr("class", "modal-actions");
- let restore = buttonWrap.append("button").attr("class", "restore").on("click", () => {
- context.history().restore();
- modalSelection.remove();
- });
- restore.append("svg").attr("class", "logo logo-restore").append("use").attr("xlink:href", "#iD-logo-restore");
- restore.append("div").call(_t.append("restore.restore"));
- let reset = buttonWrap.append("button").attr("class", "reset").on("click", () => {
- context.history().clearSaved();
- modalSelection.remove();
- });
- reset.append("svg").attr("class", "logo logo-reset").append("use").attr("xlink:href", "#iD-logo-reset");
- reset.append("div").call(_t.append("restore.reset"));
- restore.node().focus();
- };
- }
-
- // modules/ui/scale.js
- function uiScale(context) {
- var projection2 = context.projection, isImperial = !_mainLocalizer.usesMetric(), maxLength = 180, tickHeight = 8;
- function scaleDefs(loc1, loc2) {
- var lat = (loc2[1] + loc1[1]) / 2, conversion = isImperial ? 3.28084 : 1, dist = geoLonToMeters(loc2[0] - loc1[0], lat) * conversion, scale = { dist: 0, px: 0, text: "" }, buckets, i2, val, dLon;
- if (isImperial) {
- buckets = [528e4, 528e3, 52800, 5280, 500, 50, 5, 1];
- } else {
- buckets = [5e6, 5e5, 5e4, 5e3, 500, 50, 5, 1];
+ var ids = context.selectedIDs();
+ if (context.mode().id !== "select" || !ids.length || ids[0] !== _houseID) {
+ context.enter(modeSelect(context, [_houseID]));
}
- for (i2 = 0; i2 < buckets.length; i2++) {
- val = buckets[i2];
- if (dist >= val) {
- scale.dist = Math.floor(dist / val) * val;
- break;
- } else {
- scale.dist = +dist.toFixed(2);
+ context.container().select(".inspector-wrap").on("wheel.intro", eventCancel);
+ timeout2(function() {
+ context.container().select(".inspector-wrap .panewrap").style("right", "-100%");
+ var button = context.container().select(".preset-building-house .preset-list-button");
+ reveal(
+ button.node(),
+ helpHtml("intro.buildings.choose_preset_house", { preset: housePreset.name() }),
+ { duration: 300 }
+ );
+ button.on("click.intro", function() {
+ button.on("click.intro", null);
+ continueTo(closeEditorHouse);
+ });
+ }, 400);
+ context.on("enter.intro", function(mode) {
+ if (!_houseID || !context.hasEntity(_houseID)) {
+ return continueTo(addHouse);
+ }
+ var ids2 = context.selectedIDs();
+ if (mode.id !== "select" || !ids2.length || ids2[0] !== _houseID) {
+ return continueTo(chooseCategoryBuilding);
}
+ });
+ function continueTo(nextStep) {
+ context.container().select(".inspector-wrap").on("wheel.intro", null);
+ context.container().select(".preset-list-button").on("click.intro", null);
+ context.on("enter.intro", null);
+ nextStep();
}
- dLon = geoMetersToLon(scale.dist / conversion, lat);
- scale.px = Math.round(projection2([loc1[0] + dLon, loc1[1]])[0]);
- scale.text = displayLength(scale.dist / conversion, isImperial);
- return scale;
}
- function update(selection2) {
- var dims = context.map().dimensions(), loc1 = projection2.invert([0, dims[1]]), loc2 = projection2.invert([maxLength, dims[1]]), scale = scaleDefs(loc1, loc2);
- selection2.select(".scale-path").attr("d", "M0.5,0.5v" + tickHeight + "h" + scale.px + "v-" + tickHeight);
- selection2.select(".scale-text").style(_mainLocalizer.textDirection() === "ltr" ? "left" : "right", scale.px + 16 + "px").text(scale.text);
+ function closeEditorHouse() {
+ if (!_houseID || !context.hasEntity(_houseID)) {
+ return addHouse();
+ }
+ var ids = context.selectedIDs();
+ if (context.mode().id !== "select" || !ids.length || ids[0] !== _houseID) {
+ context.enter(modeSelect(context, [_houseID]));
+ }
+ context.history().checkpoint("hasHouse");
+ context.on("exit.intro", function() {
+ continueTo(rightClickHouse);
+ });
+ timeout2(function() {
+ reveal(
+ ".entity-editor-pane",
+ helpHtml("intro.buildings.close", { button: { html: icon("#iD-icon-close", "inline") } })
+ );
+ }, 500);
+ function continueTo(nextStep) {
+ context.on("exit.intro", null);
+ nextStep();
+ }
}
- return function(selection2) {
- function switchUnits() {
- isImperial = !isImperial;
- selection2.call(update);
+ function rightClickHouse() {
+ if (!_houseID) return chapter.restart();
+ context.enter(modeBrowse(context));
+ context.history().reset("hasHouse");
+ var zoom = context.map().zoom();
+ if (zoom < 20) {
+ zoom = 20;
}
- var scalegroup = selection2.append("svg").attr("class", "scale").on("click", switchUnits).append("g").attr("transform", "translate(10,11)");
- scalegroup.append("path").attr("class", "scale-path");
- selection2.append("div").attr("class", "scale-text");
- selection2.call(update);
- context.map().on("move.scale", function() {
- update(selection2);
+ context.map().centerZoomEase(house, zoom, 500);
+ context.on("enter.intro", function(mode) {
+ if (mode.id !== "select") return;
+ var ids = context.selectedIDs();
+ if (ids.length !== 1 || ids[0] !== _houseID) return;
+ timeout2(function() {
+ var node = selectMenuItem(context, "orthogonalize").node();
+ if (!node) return;
+ continueTo(clickSquare);
+ }, 50);
});
- };
- }
-
- // modules/ui/shortcuts.js
- function uiShortcuts(context) {
- var detected = utilDetect();
- var _activeTab = 0;
- var _modalSelection;
- var _selection = select_default2(null);
- var _dataShortcuts;
- function shortcutsModal(_modalSelection2) {
- _modalSelection2.select(".modal").classed("modal-shortcuts", true);
- var content = _modalSelection2.select(".content");
- content.append("div").attr("class", "modal-section header").append("h2").call(_t.append("shortcuts.title"));
- _mainFileFetcher.get("shortcuts").then(function(data) {
- _dataShortcuts = data;
- content.call(render);
- }).catch(function() {
+ context.map().on("move.intro drawn.intro", function() {
+ var rightclickString = helpHtml("intro.buildings." + (context.lastPointerType() === "mouse" ? "rightclick_building" : "edit_menu_building_touch"));
+ revealHouse(house, rightclickString, { duration: 0 });
});
+ context.history().on("change.intro", function() {
+ continueTo(rightClickHouse);
+ });
+ function continueTo(nextStep) {
+ context.on("enter.intro", null);
+ context.map().on("move.intro drawn.intro", null);
+ context.history().on("change.intro", null);
+ nextStep();
+ }
}
- function render(selection2) {
- if (!_dataShortcuts)
- return;
- var wrapper = selection2.selectAll(".wrapper").data([0]);
- var wrapperEnter = wrapper.enter().append("div").attr("class", "wrapper modal-section");
- var tabsBar = wrapperEnter.append("div").attr("class", "tabs-bar");
- var shortcutsList = wrapperEnter.append("div").attr("class", "shortcuts-list");
- wrapper = wrapper.merge(wrapperEnter);
- var tabs = tabsBar.selectAll(".tab").data(_dataShortcuts);
- var tabsEnter = tabs.enter().append("a").attr("class", "tab").attr("href", "#").on("click", function(d3_event, d) {
- d3_event.preventDefault();
- var i2 = _dataShortcuts.indexOf(d);
- _activeTab = i2;
- render(selection2);
+ function clickSquare() {
+ if (!_houseID) return chapter.restart();
+ var entity = context.hasEntity(_houseID);
+ if (!entity) return continueTo(rightClickHouse);
+ var node = selectMenuItem(context, "orthogonalize").node();
+ if (!node) {
+ return continueTo(rightClickHouse);
+ }
+ var wasChanged = false;
+ reveal(
+ ".edit-menu",
+ helpHtml("intro.buildings.square_building"),
+ { padding: 50 }
+ );
+ context.on("enter.intro", function(mode) {
+ if (mode.id === "browse") {
+ continueTo(rightClickHouse);
+ } else if (mode.id === "move" || mode.id === "rotate") {
+ continueTo(retryClickSquare);
+ }
});
- tabsEnter.append("span").html(function(d) {
- return _t.html(d.text);
+ context.map().on("move.intro", function() {
+ var node2 = selectMenuItem(context, "orthogonalize").node();
+ if (!wasChanged && !node2) {
+ return continueTo(rightClickHouse);
+ }
+ reveal(
+ ".edit-menu",
+ helpHtml("intro.buildings.square_building"),
+ { duration: 0, padding: 50 }
+ );
});
- wrapper.selectAll(".tab").classed("active", function(d, i2) {
- return i2 === _activeTab;
+ context.history().on("change.intro", function() {
+ wasChanged = true;
+ context.history().on("change.intro", null);
+ timeout2(function() {
+ if (context.history().undoAnnotation() === _t("operations.orthogonalize.annotation.feature", { n: 1 })) {
+ continueTo(doneSquare);
+ } else {
+ continueTo(retryClickSquare);
+ }
+ }, 500);
});
- var shortcuts = shortcutsList.selectAll(".shortcut-tab").data(_dataShortcuts);
- var shortcutsEnter = shortcuts.enter().append("div").attr("class", function(d) {
- return "shortcut-tab shortcut-tab-" + d.tab;
+ function continueTo(nextStep) {
+ context.on("enter.intro", null);
+ context.map().on("move.intro", null);
+ context.history().on("change.intro", null);
+ nextStep();
+ }
+ }
+ function retryClickSquare() {
+ context.enter(modeBrowse(context));
+ revealHouse(house, helpHtml("intro.buildings.retry_square"), {
+ buttonText: _t.html("intro.ok"),
+ buttonCallback: function() {
+ continueTo(rightClickHouse);
+ }
});
- var columnsEnter = shortcutsEnter.selectAll(".shortcut-column").data(function(d) {
- return d.columns;
- }).enter().append("table").attr("class", "shortcut-column");
- var rowsEnter = columnsEnter.selectAll(".shortcut-row").data(function(d) {
- return d.rows;
- }).enter().append("tr").attr("class", "shortcut-row");
- var sectionRows = rowsEnter.filter(function(d) {
- return !d.shortcuts;
+ function continueTo(nextStep) {
+ nextStep();
+ }
+ }
+ function doneSquare() {
+ context.history().checkpoint("doneSquare");
+ revealHouse(house, helpHtml("intro.buildings.done_square"), {
+ buttonText: _t.html("intro.ok"),
+ buttonCallback: function() {
+ continueTo(addTank);
+ }
});
- sectionRows.append("td");
- sectionRows.append("td").attr("class", "shortcut-section").append("h3").html(function(d) {
- return _t.html(d.text);
+ function continueTo(nextStep) {
+ nextStep();
+ }
+ }
+ function addTank() {
+ context.enter(modeBrowse(context));
+ context.history().reset("doneSquare");
+ _tankID = null;
+ var msec = transitionTime(tank, context.map().center());
+ if (msec) {
+ reveal(null, null, { duration: 0 });
+ }
+ context.map().centerZoomEase(tank, 19.5, msec);
+ timeout2(function() {
+ reveal(
+ "button.add-area",
+ helpHtml("intro.buildings.add_tank")
+ );
+ context.on("enter.intro", function(mode) {
+ if (mode.id !== "add-area") return;
+ continueTo(startTank);
+ });
+ }, msec + 100);
+ function continueTo(nextStep) {
+ context.on("enter.intro", null);
+ nextStep();
+ }
+ }
+ function startTank() {
+ if (context.mode().id !== "add-area") {
+ return continueTo(addTank);
+ }
+ _tankID = null;
+ timeout2(function() {
+ var startString = helpHtml("intro.buildings.start_tank") + helpHtml("intro.buildings.tank_edge_" + (context.lastPointerType() === "mouse" ? "click" : "tap"));
+ revealTank(tank, startString);
+ context.map().on("move.intro drawn.intro", function() {
+ revealTank(tank, startString, { duration: 0 });
+ });
+ context.on("enter.intro", function(mode) {
+ if (mode.id !== "draw-area") return chapter.restart();
+ continueTo(continueTank);
+ });
+ }, 550);
+ function continueTo(nextStep) {
+ context.map().on("move.intro drawn.intro", null);
+ context.on("enter.intro", null);
+ nextStep();
+ }
+ }
+ function continueTank() {
+ if (context.mode().id !== "draw-area") {
+ return continueTo(addTank);
+ }
+ _tankID = null;
+ var continueString = helpHtml("intro.buildings.continue_tank") + "{br}" + helpHtml("intro.areas.finish_area_" + (context.lastPointerType() === "mouse" ? "click" : "tap")) + helpHtml("intro.buildings.finish_tank");
+ revealTank(tank, continueString);
+ context.map().on("move.intro drawn.intro", function() {
+ revealTank(tank, continueString, { duration: 0 });
});
- var shortcutRows = rowsEnter.filter(function(d) {
- return d.shortcuts;
+ context.on("enter.intro", function(mode) {
+ if (mode.id === "draw-area") {
+ return;
+ } else if (mode.id === "select") {
+ _tankID = context.selectedIDs()[0];
+ return continueTo(searchPresetTank);
+ } else {
+ return continueTo(addTank);
+ }
});
- var shortcutKeys = shortcutRows.append("td").attr("class", "shortcut-keys");
- var modifierKeys = shortcutKeys.filter(function(d) {
- return d.modifiers;
+ function continueTo(nextStep) {
+ context.map().on("move.intro drawn.intro", null);
+ context.on("enter.intro", null);
+ nextStep();
+ }
+ }
+ function searchPresetTank() {
+ if (!_tankID || !context.hasEntity(_tankID)) {
+ return addTank();
+ }
+ var ids = context.selectedIDs();
+ if (context.mode().id !== "select" || !ids.length || ids[0] !== _tankID) {
+ context.enter(modeSelect(context, [_tankID]));
+ }
+ context.container().select(".inspector-wrap").on("wheel.intro", eventCancel);
+ timeout2(function() {
+ context.container().select(".inspector-wrap .panewrap").style("right", "-100%");
+ context.container().select(".preset-search-input").on("keydown.intro", null).on("keyup.intro", checkPresetSearch);
+ reveal(
+ ".preset-search-input",
+ helpHtml("intro.buildings.search_tank", { preset: tankPreset.name() })
+ );
+ }, 400);
+ context.on("enter.intro", function(mode) {
+ if (!_tankID || !context.hasEntity(_tankID)) {
+ return continueTo(addTank);
+ }
+ var ids2 = context.selectedIDs();
+ if (mode.id !== "select" || !ids2.length || ids2[0] !== _tankID) {
+ context.enter(modeSelect(context, [_tankID]));
+ context.container().select(".inspector-wrap .panewrap").style("right", "-100%");
+ 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.buildings.search_tank", { preset: tankPreset.name() })
+ );
+ context.history().on("change.intro", null);
+ }
});
- modifierKeys.selectAll("kbd.modifier").data(function(d) {
- if (detected.os === "win" && d.text === "shortcuts.editing.commands.redo") {
- return ["\u2318"];
- } else if (detected.os !== "mac" && d.text === "shortcuts.browsing.display_options.fullscreen") {
- return [];
- } else {
- return d.modifiers;
+ function checkPresetSearch() {
+ var first = context.container().select(".preset-list-item:first-child");
+ if (first.classed("preset-man_made-storage_tank")) {
+ reveal(
+ first.select(".preset-list-button").node(),
+ helpHtml("intro.buildings.choose_tank", { preset: tankPreset.name() }),
+ { duration: 300 }
+ );
+ context.container().select(".preset-search-input").on("keydown.intro", eventCancel, true).on("keyup.intro", null);
+ context.history().on("change.intro", function() {
+ continueTo(closeEditorTank);
+ });
}
- }).enter().each(function() {
- var selection3 = select_default2(this);
- selection3.append("kbd").attr("class", "modifier").text(function(d) {
- return uiCmd.display(d);
- });
- selection3.append("span").text("+");
+ }
+ function continueTo(nextStep) {
+ context.container().select(".inspector-wrap").on("wheel.intro", null);
+ context.on("enter.intro", null);
+ context.history().on("change.intro", null);
+ context.container().select(".preset-search-input").on("keydown.intro keyup.intro", null);
+ nextStep();
+ }
+ }
+ function closeEditorTank() {
+ if (!_tankID || !context.hasEntity(_tankID)) {
+ return addTank();
+ }
+ var ids = context.selectedIDs();
+ if (context.mode().id !== "select" || !ids.length || ids[0] !== _tankID) {
+ context.enter(modeSelect(context, [_tankID]));
+ }
+ context.history().checkpoint("hasTank");
+ context.on("exit.intro", function() {
+ continueTo(rightClickTank);
});
- shortcutKeys.selectAll("kbd.shortcut").data(function(d) {
- var arr = d.shortcuts;
- if (detected.os === "win" && d.text === "shortcuts.editing.commands.redo") {
- arr = ["Y"];
- } else if (detected.os !== "mac" && d.text === "shortcuts.browsing.display_options.fullscreen") {
- arr = ["F11"];
- }
- arr = arr.map(function(s) {
- return uiCmd.display(s.indexOf(".") !== -1 ? _t(s) : s);
+ timeout2(function() {
+ reveal(
+ ".entity-editor-pane",
+ helpHtml("intro.buildings.close", { button: { html: icon("#iD-icon-close", "inline") } })
+ );
+ }, 500);
+ function continueTo(nextStep) {
+ context.on("exit.intro", null);
+ nextStep();
+ }
+ }
+ function rightClickTank() {
+ 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;
+ var ids = context.selectedIDs();
+ if (ids.length !== 1 || ids[0] !== _tankID) return;
+ timeout2(function() {
+ var node = selectMenuItem(context, "circularize").node();
+ if (!node) return;
+ continueTo(clickCircle);
+ }, 50);
});
- return utilArrayUniq(arr).map(function(s) {
- return {
- shortcut: s,
- separator: d.separator,
- suffix: d.suffix
- };
+ var rightclickString = helpHtml("intro.buildings." + (context.lastPointerType() === "mouse" ? "rightclick_tank" : "edit_menu_tank_touch"));
+ revealTank(tank, rightclickString);
+ context.map().on("move.intro drawn.intro", function() {
+ revealTank(tank, rightclickString, { duration: 0 });
});
- }).enter().each(function(d, i2, nodes) {
- var selection3 = select_default2(this);
- var click = d.shortcut.toLowerCase().match(/(.*).click/);
- if (click && click[1]) {
- selection3.call(svgIcon("#iD-walkthrough-mouse-" + click[1], "operation"));
- } else if (d.shortcut.toLowerCase() === "long-press") {
- selection3.call(svgIcon("#iD-walkthrough-longpress", "longpress operation"));
- } else if (d.shortcut.toLowerCase() === "tap") {
- selection3.call(svgIcon("#iD-walkthrough-tap", "tap operation"));
- } else {
- selection3.append("kbd").attr("class", "shortcut").text(function(d2) {
- return d2.shortcut;
- });
- }
- if (i2 < nodes.length - 1) {
- selection3.append("span").html(d.separator || "\xA0" + _t.html("shortcuts.or") + "\xA0");
- } else if (i2 === nodes.length - 1 && d.suffix) {
- selection3.append("span").text(d.suffix);
+ context.history().on("change.intro", function() {
+ continueTo(rightClickTank);
+ });
+ }, 600);
+ function continueTo(nextStep) {
+ context.on("enter.intro", null);
+ context.map().on("move.intro drawn.intro", null);
+ context.history().on("change.intro", null);
+ nextStep();
+ }
+ }
+ function clickCircle() {
+ if (!_tankID) return chapter.restart();
+ var entity = context.hasEntity(_tankID);
+ if (!entity) return continueTo(rightClickTank);
+ var node = selectMenuItem(context, "circularize").node();
+ if (!node) {
+ return continueTo(rightClickTank);
+ }
+ var wasChanged = false;
+ reveal(
+ ".edit-menu",
+ helpHtml("intro.buildings.circle_tank"),
+ { padding: 50 }
+ );
+ context.on("enter.intro", function(mode) {
+ if (mode.id === "browse") {
+ continueTo(rightClickTank);
+ } else if (mode.id === "move" || mode.id === "rotate") {
+ continueTo(retryClickCircle);
}
});
- shortcutKeys.filter(function(d) {
- return d.gesture;
- }).each(function() {
- var selection3 = select_default2(this);
- selection3.append("span").text("+");
- selection3.append("span").attr("class", "gesture").html(function(d) {
- return _t.html(d.gesture);
- });
+ context.map().on("move.intro", function() {
+ var node2 = selectMenuItem(context, "circularize").node();
+ if (!wasChanged && !node2) {
+ return continueTo(rightClickTank);
+ }
+ reveal(
+ ".edit-menu",
+ helpHtml("intro.buildings.circle_tank"),
+ { duration: 0, padding: 50 }
+ );
});
- shortcutRows.append("td").attr("class", "shortcut-desc").html(function(d) {
- return d.text ? _t.html(d.text) : "\xA0";
+ context.history().on("change.intro", function() {
+ wasChanged = true;
+ context.history().on("change.intro", null);
+ timeout2(function() {
+ if (context.history().undoAnnotation() === _t("operations.circularize.annotation.feature", { n: 1 })) {
+ continueTo(play);
+ } else {
+ continueTo(retryClickCircle);
+ }
+ }, 500);
});
- wrapper.selectAll(".shortcut-tab").style("display", function(d, i2) {
- return i2 === _activeTab ? "flex" : "none";
+ function continueTo(nextStep) {
+ context.on("enter.intro", null);
+ context.map().on("move.intro", null);
+ context.history().on("change.intro", null);
+ nextStep();
+ }
+ }
+ function retryClickCircle() {
+ context.enter(modeBrowse(context));
+ revealTank(tank, helpHtml("intro.buildings.retry_circle"), {
+ buttonText: _t.html("intro.ok"),
+ buttonCallback: function() {
+ continueTo(rightClickTank);
+ }
});
+ function continueTo(nextStep) {
+ nextStep();
+ }
}
- return function(selection2, show) {
- _selection = selection2;
- if (show) {
- _modalSelection = uiModal(selection2);
- _modalSelection.call(shortcutsModal);
- } else {
- context.keybinding().on([_t("shortcuts.toggle.key"), "?"], function() {
- if (context.container().selectAll(".modal-shortcuts").size()) {
- if (_modalSelection) {
- _modalSelection.close();
- _modalSelection = null;
- }
- } else {
- _modalSelection = uiModal(_selection);
- _modalSelection.call(shortcutsModal);
+ function play() {
+ dispatch14.call("done");
+ reveal(
+ ".ideditor",
+ helpHtml("intro.buildings.play", { next: _t("intro.startediting.title") }),
+ {
+ tooltipBox: ".intro-nav-wrap .chapter-startEditing",
+ buttonText: _t.html("intro.ok"),
+ buttonCallback: function() {
+ reveal(".ideditor");
}
- });
- }
+ }
+ );
+ }
+ chapter.enter = function() {
+ addHouse();
+ };
+ 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(".preset-search-input").on("keydown.intro keyup.intro", null);
+ context.container().select(".more-fields .combobox-input").on("click.intro", null);
};
+ chapter.restart = function() {
+ chapter.exit();
+ chapter.enter();
+ };
+ return utilRebind(chapter, dispatch14, "on");
}
- // modules/ui/data_header.js
- function uiDataHeader() {
- var _datum;
- function dataHeader(selection2) {
- var header = selection2.selectAll(".data-header").data(_datum ? [_datum] : [], function(d) {
- return d.__featurehash__;
+ // modules/ui/intro/start_editing.js
+ function uiIntroStartEditing(context, reveal) {
+ var dispatch14 = dispatch_default("done", "startEditing");
+ var modalSelection = select_default2(null);
+ var chapter = {
+ title: "intro.startediting.title"
+ };
+ function showHelp() {
+ reveal(
+ ".map-control.help-control",
+ helpHtml("intro.startediting.help"),
+ {
+ buttonText: _t.html("intro.ok"),
+ buttonCallback: function() {
+ shortcuts();
+ }
+ }
+ );
+ }
+ function shortcuts() {
+ reveal(
+ ".map-control.help-control",
+ helpHtml("intro.startediting.shortcuts"),
+ {
+ buttonText: _t.html("intro.ok"),
+ buttonCallback: function() {
+ showSave();
+ }
+ }
+ );
+ }
+ function showSave() {
+ context.container().selectAll(".shaded").remove();
+ reveal(
+ ".top-toolbar button.save",
+ helpHtml("intro.startediting.save"),
+ {
+ buttonText: _t.html("intro.ok"),
+ buttonCallback: function() {
+ showStart();
+ }
+ }
+ );
+ }
+ function showStart() {
+ context.container().selectAll(".shaded").remove();
+ modalSelection = uiModal(context.container());
+ modalSelection.select(".modal").attr("class", "modal-splash modal");
+ modalSelection.selectAll(".close").remove();
+ var startbutton = modalSelection.select(".content").attr("class", "fillL").append("button").attr("class", "modal-section huge-modal-button").on("click", function() {
+ modalSelection.remove();
});
- header.exit().remove();
- var headerEnter = header.enter().append("div").attr("class", "data-header");
- var iconEnter = headerEnter.append("div").attr("class", "data-header-icon");
- iconEnter.append("div").attr("class", "preset-icon-28").call(svgIcon("#iD-icon-data", "note-fill"));
- headerEnter.append("div").attr("class", "data-header-label").call(_t.append("map_data.layers.custom.title"));
+ startbutton.append("svg").attr("class", "illustration").append("use").attr("xlink:href", "#iD-logo-walkthrough");
+ startbutton.append("h2").call(_t.append("intro.startediting.start"));
+ dispatch14.call("startEditing");
}
- dataHeader.datum = function(val) {
- if (!arguments.length)
- return _datum;
- _datum = val;
- return this;
+ chapter.enter = function() {
+ showHelp();
};
- return dataHeader;
+ chapter.exit = function() {
+ modalSelection.remove();
+ context.container().selectAll(".shaded").remove();
+ };
+ return utilRebind(chapter, dispatch14, "on");
}
- // modules/ui/combobox.js
- var _comboHideTimerID;
- function uiCombobox(context, klass) {
- var dispatch10 = dispatch_default("accept", "cancel");
- var container = context.container();
- var _suggestions = [];
- var _data = [];
- var _fetched = {};
- var _selected = null;
- var _canAutocomplete = true;
- var _caseSensitive = false;
- var _cancelFetch = false;
- var _minItems = 2;
- var _tDown = 0;
- var _mouseEnterHandler, _mouseLeaveHandler;
- var _fetcher = function(val, cb) {
- cb(_data.filter(function(d) {
- var terms = d.terms || [];
- terms.push(d.value);
- return terms.some(function(term) {
- return term.toString().toLowerCase().indexOf(val.toLowerCase()) !== -1;
- });
- }));
- };
- var combobox = function(input, attachTo) {
- if (!input || input.empty())
- return;
- input.classed("combobox-input", true).on("focus.combo-input", focus).on("blur.combo-input", blur).on("keydown.combo-input", keydown).on("keyup.combo-input", keyup).on("input.combo-input", change).on("mousedown.combo-input", mousedown).each(function() {
- var parent = this.parentNode;
- var sibling = this.nextSibling;
- select_default2(parent).selectAll(".combobox-caret").filter(function(d) {
- return d === input.node();
- }).data([input.node()]).enter().insert("div", function() {
- return sibling;
- }).attr("class", "combobox-caret").on("mousedown.combo-caret", function(d3_event) {
- d3_event.preventDefault();
- input.node().focus();
- mousedown(d3_event);
- }).on("mouseup.combo-caret", function(d3_event) {
- d3_event.preventDefault();
- mouseup(d3_event);
- });
- });
- function mousedown(d3_event) {
- if (d3_event.button !== 0)
- return;
- if (input.classed("disabled"))
- return;
- _tDown = +new Date();
- var start2 = input.property("selectionStart");
- var end = input.property("selectionEnd");
- if (start2 !== end) {
- var val = utilGetSetValue(input);
- input.node().setSelectionRange(val.length, val.length);
- return;
- }
- input.on("mouseup.combo-input", mouseup);
- }
- function mouseup(d3_event) {
- input.on("mouseup.combo-input", null);
- if (d3_event.button !== 0)
- return;
- if (input.classed("disabled"))
- return;
- if (input.node() !== document.activeElement)
- return;
- var start2 = input.property("selectionStart");
- var end = input.property("selectionEnd");
- if (start2 !== end)
- return;
- var combo = container.selectAll(".combobox");
- if (combo.empty() || combo.datum() !== input.node()) {
- var tOrig = _tDown;
- window.setTimeout(function() {
- if (tOrig !== _tDown)
- return;
- fetchComboData("", function() {
- show();
- render();
- });
- }, 250);
- } else {
- hide();
- }
- }
- function focus() {
- fetchComboData("");
- }
- function blur() {
- _comboHideTimerID = window.setTimeout(hide, 75);
- }
- function show() {
- hide();
- container.insert("div", ":first-child").datum(input.node()).attr("class", "combobox" + (klass ? " combobox-" + klass : "")).style("position", "absolute").style("display", "block").style("left", "0px").on("mousedown.combo-container", function(d3_event) {
- d3_event.preventDefault();
- });
- container.on("scroll.combo-scroll", render, true);
- }
- function hide() {
- if (_comboHideTimerID) {
- window.clearTimeout(_comboHideTimerID);
- _comboHideTimerID = void 0;
+ // modules/ui/intro/intro.js
+ var chapterUi = {
+ welcome: uiIntroWelcome,
+ navigation: uiIntroNavigation,
+ point: uiIntroPoint,
+ area: uiIntroArea,
+ line: uiIntroLine,
+ building: uiIntroBuilding,
+ startEditing: uiIntroStartEditing
+ };
+ var chapterFlow = [
+ "welcome",
+ "navigation",
+ "point",
+ "area",
+ "line",
+ "building",
+ "startEditing"
+ ];
+ function uiIntro(context) {
+ const INTRO_IMAGERY = "EsriWorldImageryClarity";
+ let _introGraph = {};
+ let _currChapter;
+ function intro(selection2) {
+ _mainFileFetcher.get("intro_graph").then((dataIntroGraph) => {
+ for (let id2 in dataIntroGraph) {
+ if (!_introGraph[id2]) {
+ _introGraph[id2] = osmEntity(localize(dataIntroGraph[id2]));
+ }
}
- container.selectAll(".combobox").remove();
- container.on("scroll.combo-scroll", null);
+ selection2.call(startIntro);
+ }).catch(function() {
+ });
+ }
+ function startIntro(selection2) {
+ context.enter(modeBrowse(context));
+ let osm = context.connection();
+ let history = context.history().toJSON();
+ let hash2 = window.location.hash;
+ let center = context.map().center();
+ let zoom = context.map().zoom();
+ let background = context.background().baseLayerSource();
+ let overlays = context.background().overlayLayerSources();
+ let opacity = context.container().selectAll(".main-map .layer-background").style("opacity");
+ let caches = osm && osm.caches();
+ let baseEntities = context.history().graph().base().entities;
+ context.ui().sidebar.expand();
+ context.container().selectAll("button.sidebar-toggle").classed("disabled", true);
+ context.inIntro(true);
+ if (osm) {
+ osm.toggle(false).reset();
}
- function keydown(d3_event) {
- var shown = !container.selectAll(".combobox").empty();
- var tagName = input.node() ? input.node().tagName.toLowerCase() : "";
- switch (d3_event.keyCode) {
- case 8:
- case 46:
- d3_event.stopPropagation();
- _selected = null;
- render();
- input.on("input.combo-input", function() {
- var start2 = input.property("selectionStart");
- input.node().setSelectionRange(start2, start2);
- input.on("input.combo-input", change);
- });
- break;
- case 9:
- accept(d3_event);
- break;
- case 13:
- d3_event.preventDefault();
- d3_event.stopPropagation();
- break;
- case 38:
- if (tagName === "textarea" && !shown)
- return;
- d3_event.preventDefault();
- if (tagName === "input" && !shown) {
- show();
- }
- nav(-1);
- break;
- case 40:
- if (tagName === "textarea" && !shown)
- return;
- d3_event.preventDefault();
- if (tagName === "input" && !shown) {
- show();
- }
- nav(1);
- break;
- }
+ context.history().reset();
+ context.history().merge(Object.values(coreGraph().load(_introGraph).entities));
+ context.history().checkpoint("initial");
+ let imagery = context.background().findSource(INTRO_IMAGERY);
+ if (imagery) {
+ context.background().baseLayerSource(imagery);
+ } else {
+ context.background().bing();
}
- function keyup(d3_event) {
- switch (d3_event.keyCode) {
- case 27:
- cancel();
- break;
- case 13:
- accept(d3_event);
- break;
+ overlays.forEach((d2) => context.background().toggleOverlayLayer(d2));
+ let layers = context.layers();
+ layers.all().forEach((item) => {
+ if (typeof item.layer.enabled === "function") {
+ item.layer.enabled(item.id === "osm");
}
- }
- function change() {
- fetchComboData(value(), function() {
- _selected = null;
- var val = input.property("value");
- if (_suggestions.length) {
- if (input.property("selectionEnd") === val.length) {
- _selected = tryAutocomplete();
- }
- if (!_selected) {
- _selected = val;
- }
- }
- if (val.length) {
- var combo = container.selectAll(".combobox");
- if (combo.empty()) {
- show();
- }
- } else {
- hide();
+ });
+ context.container().selectAll(".main-map .layer-background").style("opacity", 1);
+ let curtain = uiCurtain(context.container().node());
+ selection2.call(curtain);
+ corePreferences("walkthrough_started", "yes");
+ let storedProgress = corePreferences("walkthrough_progress") || "";
+ let progress = storedProgress.split(";").filter(Boolean);
+ 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);
}
- render();
+ progress.push(chapter);
+ corePreferences("walkthrough_progress", utilArrayUniq(progress).join(";"));
});
- }
- function nav(dir) {
- if (_suggestions.length) {
- var index = -1;
- for (var i2 = 0; i2 < _suggestions.length; i2++) {
- if (_selected && _suggestions[i2].value === _selected) {
- index = i2;
- break;
- }
- }
- index = Math.max(Math.min(index + dir, _suggestions.length - 1), 0);
- _selected = _suggestions[index].value;
- input.property("value", _selected);
+ return s2;
+ });
+ chapters[chapters.length - 1].on("startEditing", () => {
+ progress.push("startEditing");
+ corePreferences("walkthrough_progress", utilArrayUniq(progress).join(";"));
+ let incomplete = utilArrayDifference(chapterFlow, progress);
+ if (!incomplete.length) {
+ corePreferences("walkthrough_completed", "yes");
}
- render();
- ensureVisible();
- }
- function ensureVisible() {
- var combo = container.selectAll(".combobox");
- if (combo.empty())
- return;
- var containerRect = container.node().getBoundingClientRect();
- var comboRect = combo.node().getBoundingClientRect();
- if (comboRect.bottom > containerRect.bottom) {
- var node = attachTo ? attachTo.node() : input.node();
- node.scrollIntoView({ behavior: "instant", block: "center" });
- render();
+ curtain.remove();
+ navwrap.remove();
+ context.container().selectAll(".main-map .layer-background").style("opacity", opacity);
+ context.container().selectAll("button.sidebar-toggle").classed("disabled", false);
+ if (osm) {
+ osm.toggle(true).reset().caches(caches);
}
- var selected = combo.selectAll(".combobox-option.selected").node();
- if (selected) {
- selected.scrollIntoView({ behavior: "smooth", block: "nearest" });
+ context.history().reset().merge(Object.values(baseEntities));
+ context.background().baseLayerSource(background);
+ overlays.forEach((d2) => context.background().toggleOverlayLayer(d2));
+ if (history) {
+ context.history().fromJSON(history, false);
+ }
+ context.map().centerZoom(center, zoom);
+ window.location.replace(hash2);
+ context.inIntro(false);
+ });
+ 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", (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) {
+ if (_currChapter) {
+ _currChapter.exit();
}
+ context.enter(modeBrowse(context));
+ _currChapter = newChapter;
+ _currChapter.enter();
+ buttons.classed("next", false).classed("active", (d2) => d2.title === _currChapter.title);
+ }
+ }
+ return intro;
+ }
+
+ // modules/ui/issues_info.js
+ function uiIssuesInfo(context) {
+ var warningsItem = {
+ id: "warnings",
+ count: 0,
+ iconID: "iD-icon-alert",
+ descriptionID: "issues.warnings_and_errors"
+ };
+ var resolvedItem = {
+ id: "resolved",
+ count: 0,
+ iconID: "iD-icon-apply",
+ descriptionID: "issues.user_resolved_issues"
+ };
+ function update(selection2) {
+ var shownItems = [];
+ var liveIssues = context.validator().getIssues({
+ what: corePreferences("validate-what") || "edited",
+ where: corePreferences("validate-where") || "all"
+ });
+ if (liveIssues.length) {
+ warningsItem.count = liveIssues.length;
+ shownItems.push(warningsItem);
}
- function value() {
- var value2 = input.property("value");
- var start2 = input.property("selectionStart");
- var end = input.property("selectionEnd");
- if (start2 && end) {
- value2 = value2.substring(0, start2);
+ if (corePreferences("validate-what") === "all") {
+ var resolvedIssues = context.validator().getResolvedIssues();
+ if (resolvedIssues.length) {
+ resolvedItem.count = resolvedIssues.length;
+ shownItems.push(resolvedItem);
}
- return value2;
}
- function fetchComboData(v, cb) {
- _cancelFetch = false;
- _fetcher.call(input, v, function(results) {
- if (_cancelFetch)
- return;
- _suggestions = results;
- results.forEach(function(d) {
- _fetched[d.value] = d;
- });
- if (cb) {
- cb();
- }
+ var chips = selection2.selectAll(".chip").data(shownItems, function(d2) {
+ return d2.id;
+ });
+ chips.exit().remove();
+ 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(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("#" + d2.iconID));
+ });
+ enter.append("span").attr("class", "count");
+ enter.merge(chips).selectAll("span.count").text(function(d2) {
+ return d2.count.toString();
+ });
+ }
+ return function(selection2) {
+ update(selection2);
+ context.validator().on("validated.infobox", function() {
+ update(selection2);
+ });
+ };
+ }
+
+ // 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;
+ var _a3;
+ (_a3 = window.matchMedia) == null ? void 0 : _a3.call(window, "\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 tryAutocomplete() {
- if (!_canAutocomplete)
- return;
- var val = _caseSensitive ? value() : value().toLowerCase();
- if (!val)
- return;
- if (!isNaN(parseFloat(val)) && isFinite(val))
- return;
- var bestIndex = -1;
- for (var i2 = 0; i2 < _suggestions.length; i2++) {
- var suggestion = _suggestions[i2].value;
- var compare = _caseSensitive ? suggestion : suggestion.toLowerCase();
- if (compare === val) {
- bestIndex = i2;
- break;
- } else if (bestIndex === -1 && compare.indexOf(val) === 0) {
- bestIndex = i2;
- }
- }
- if (bestIndex !== -1) {
- var bestVal = _suggestions[bestIndex].value;
- input.property("value", bestVal);
- input.node().setSelectionRange(val.length, bestVal.length);
- return bestVal;
- }
- }
- function render() {
- if (_suggestions.length < _minItems || document.activeElement !== input.node()) {
- hide();
- return;
- }
- var shown = !container.selectAll(".combobox").empty();
- if (!shown)
- return;
- var combo = container.selectAll(".combobox");
- var options2 = combo.selectAll(".combobox-option").data(_suggestions, function(d) {
- return d.value;
- });
- options2.exit().remove();
- options2.enter().append("a").attr("class", function(d) {
- return "combobox-option " + (d.klass || "");
- }).attr("title", function(d) {
- return d.title;
- }).html(function(d) {
- return d.display || d.value;
- }).on("mouseenter", _mouseEnterHandler).on("mouseleave", _mouseLeaveHandler).merge(options2).classed("selected", function(d) {
- return d.value === _selected;
- }).on("click.combo-option", accept).order();
- var node = attachTo ? attachTo.node() : input.node();
- var containerRect = container.node().getBoundingClientRect();
- var rect = node.getBoundingClientRect();
- combo.style("left", rect.left + 5 - containerRect.left + "px").style("width", rect.width - 10 + "px").style("top", rect.height + rect.top - containerRect.top + "px");
+ }
+ 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, "");
+ return _t("imagery." + id_safe + ".name", { default: (0, import_lodash4.escape)(_name) });
+ };
+ source.label = function() {
+ var id_safe = source.id.replace(/\./g, "");
+ return _t.append("imagery." + id_safe + ".name", { default: (0, import_lodash4.escape)(_name) });
+ };
+ source.hasDescription = function() {
+ var id_safe = source.id.replace(/\./g, "");
+ var descriptionText = _mainLocalizer.tInfo("imagery." + id_safe + ".description", { default: (0, import_lodash4.escape)(_description) }).text;
+ return descriptionText !== "";
+ };
+ source.description = function() {
+ var id_safe = source.id.replace(/\./g, "");
+ return _t.append("imagery." + id_safe + ".description", { default: (0, import_lodash4.escape)(_description) });
+ };
+ source.best = function() {
+ return _best;
+ };
+ source.area = function() {
+ if (!data.polygon) return Number.MAX_VALUE;
+ var area = area_default({ type: "MultiPolygon", coordinates: [data.polygon] });
+ return isNaN(area) ? 0 : area;
+ };
+ source.imageryUsed = function() {
+ return _name || source.id;
+ };
+ source.template = function(val) {
+ if (!arguments.length) return _template;
+ if (source.id === "custom" || source.id === "Bing") {
+ _template = val;
}
- function accept(d3_event, d) {
- _cancelFetch = true;
- var thiz = input.node();
- if (d) {
- utilGetSetValue(input, d.value);
- utilTriggerEvent(input, "change");
+ return source;
+ };
+ source.url = function(coord2) {
+ var result = _template.replace(new RegExp("#[\\s\\S]*", "u"), "");
+ if (result === "") return result;
+ if (!source.type || source.id === "custom") {
+ if (/SERVICE=WMS|\{(proj|wkid|bbox)\}/.test(result)) {
+ source.type = "wms";
+ source.projection = "EPSG:3857";
+ } else if (/\{(x|y)\}/.test(result)) {
+ source.type = "tms";
+ } else if (/\{u\}/.test(result)) {
+ source.type = "bing";
}
- var val = utilGetSetValue(input);
- thiz.setSelectionRange(val.length, val.length);
- d = _fetched[val];
- dispatch10.call("accept", thiz, d, val);
- hide();
}
- function cancel() {
- _cancelFetch = true;
- var thiz = input.node();
- var val = utilGetSetValue(input);
- var start2 = input.property("selectionStart");
- var end = input.property("selectionEnd");
- val = val.slice(0, start2) + val.slice(end);
- utilGetSetValue(input, val);
- thiz.setSelectionRange(val.length, val.length);
- dispatch10.call("cancel", thiz);
- hide();
+ if (source.type === "wms") {
+ var tileToProjectedCoords = function(x2, y2, z2) {
+ var zoomSize = Math.pow(2, z2);
+ var lon = x2 / zoomSize * Math.PI * 2 - Math.PI;
+ var lat = Math.atan(Math.sinh(Math.PI * (1 - 2 * y2 / zoomSize)));
+ switch (source.projection) {
+ case "EPSG:4326":
+ return {
+ x: lon * 180 / Math.PI,
+ y: lat * 180 / Math.PI
+ };
+ default:
+ var mercCoords = mercatorRaw(lon, lat);
+ return {
+ x: 2003750834e-2 / Math.PI * mercCoords[0],
+ y: 2003750834e-2 / Math.PI * mercCoords[1]
+ };
+ }
+ };
+ var tileSize = source.tileSize;
+ var projection2 = source.projection;
+ var minXmaxY = tileToProjectedCoords(coord2[0], coord2[1], coord2[2]);
+ var maxXminY = tileToProjectedCoords(coord2[0] + 1, coord2[1] + 1, coord2[2]);
+ result = result.replace(/\{(\w+)\}/g, function(token, key) {
+ switch (key) {
+ case "width":
+ case "height":
+ return tileSize;
+ case "proj":
+ return projection2;
+ case "wkid":
+ return projection2.replace(/^EPSG:/, "");
+ case "bbox":
+ if (projection2 === "EPSG:4326" && // The CRS parameter implies version 1.3 (prior versions use SRS)
+ /VERSION=1.3|CRS={proj}/.test(source.template().toUpperCase())) {
+ return maxXminY.y + "," + minXmaxY.x + "," + minXmaxY.y + "," + maxXminY.x;
+ } else {
+ return minXmaxY.x + "," + maxXminY.y + "," + maxXminY.x + "," + minXmaxY.y;
+ }
+ case "w":
+ return minXmaxY.x;
+ case "s":
+ return maxXminY.y;
+ case "n":
+ return maxXminY.x;
+ case "e":
+ return minXmaxY.y;
+ default:
+ return token;
+ }
+ });
+ } else if (source.type === "tms") {
+ result = result.replace("{x}", coord2[0]).replace("{y}", coord2[1]).replace(/\{[t-]y\}/, Math.pow(2, coord2[2]) - coord2[1] - 1).replace(/\{z(oom)?\}/, coord2[2]).replace(/\{@2x\}|\{r\}/, isRetina ? "@2x" : "");
+ } else if (source.type === "bing") {
+ result = result.replace("{u}", function() {
+ var u2 = "";
+ for (var zoom = coord2[2]; zoom > 0; zoom--) {
+ var b2 = 0;
+ var mask = 1 << zoom - 1;
+ if ((coord2[0] & mask) !== 0) b2++;
+ if ((coord2[1] & mask) !== 0) b2 += 2;
+ u2 += b2.toString();
+ }
+ return u2;
+ });
}
+ result = result.replace(/\{switch:([^}]+)\}/, function(s2, r2) {
+ var subdomains = r2.split(",");
+ return subdomains[(coord2[0] + coord2[1]) % subdomains.length];
+ });
+ return result;
};
- combobox.canAutocomplete = function(val) {
- if (!arguments.length)
- return _canAutocomplete;
- _canAutocomplete = val;
- return combobox;
+ source.validZoom = function(z2, underzoom) {
+ if (underzoom === void 0) underzoom = 0;
+ return source.zoomExtent[0] - underzoom <= z2 && (source.overzoom || source.zoomExtent[1] > z2);
};
- combobox.caseSensitive = function(val) {
- if (!arguments.length)
- return _caseSensitive;
- _caseSensitive = val;
- return combobox;
+ source.isLocatorOverlay = function() {
+ return source.id === "mapbox_locator_overlay";
};
- combobox.data = function(val) {
- if (!arguments.length)
- return _data;
- _data = val;
- return combobox;
+ source.isHidden = function() {
+ return source.id === "DigitalGlobe-Premium-vintage" || source.id === "DigitalGlobe-Standard-vintage";
};
- combobox.fetcher = function(val) {
- if (!arguments.length)
- return _fetcher;
- _fetcher = val;
- return combobox;
+ source.copyrightNotices = function() {
};
- combobox.minItems = function(val) {
- if (!arguments.length)
- return _minItems;
- _minItems = val;
- return combobox;
+ source.getMetadata = function(center, tileCoord, callback) {
+ var vintage = {
+ start: localeDateString(source.startDate),
+ end: localeDateString(source.endDate)
+ };
+ vintage.range = vintageRange(vintage);
+ var metadata = { vintage };
+ callback(null, metadata);
};
- combobox.itemsMouseEnter = function(val) {
- if (!arguments.length)
- return _mouseEnterHandler;
- _mouseEnterHandler = val;
- return combobox;
+ return source;
+ }
+ rendererBackgroundSource.Bing = function(data, dispatch14) {
+ data.template = "https://ecn.t{switch:0,1,2,3}.tiles.virtualearth.net/tiles/a{u}.jpeg?g=1&pr=odbl&n=z";
+ var bing = rendererBackgroundSource(data);
+ var key = utilAesDecrypt("5c875730b09c6b422433e807e1ff060b6536c791dbfffcffc4c6b18a1bdba1f14593d151adb50e19e1be1ab19aef813bf135d0f103475e5c724dec94389e45d0");
+ const strictParam = "n";
+ var url = "https://dev.virtualearth.net/REST/v1/Imagery/Metadata/AerialOSM?include=ImageryProviders&uriScheme=https&key=" + key;
+ var cache = {};
+ var inflight = {};
+ var providers = [];
+ var taskQueue = new IntervalTasksQueue(250);
+ var metadataLastZoom = -1;
+ json_default(url).then(function(json) {
+ let imageryResource = json.resourceSets[0].resources[0];
+ let template = imageryResource.imageUrl;
+ let subDomains = imageryResource.imageUrlSubdomains;
+ let subDomainNumbers = subDomains.map((subDomain) => {
+ return subDomain.substring(1);
+ }).join(",");
+ template = template.replace("{subdomain}", "t{switch:".concat(subDomainNumbers, "}")).replace("{quadkey}", "{u}");
+ if (!new URLSearchParams(template).has(strictParam)) {
+ template += "&".concat(strictParam, "=z");
+ }
+ bing.template(template);
+ providers = imageryResource.imageryProviders.map(function(provider) {
+ return {
+ attribution: provider.attribution,
+ areas: provider.coverageAreas.map(function(area) {
+ return {
+ zoom: [area.zoomMin, area.zoomMax],
+ extent: geoExtent([area.bbox[1], area.bbox[0]], [area.bbox[3], area.bbox[2]])
+ };
+ })
+ };
+ });
+ dispatch14.call("change");
+ }).catch(function() {
+ });
+ bing.copyrightNotices = function(zoom, extent) {
+ zoom = Math.min(zoom, 21);
+ return providers.filter(function(provider) {
+ return provider.areas.some(function(area) {
+ return extent.intersects(area.extent) && area.zoom[0] <= zoom && area.zoom[1] >= zoom;
+ });
+ }).map(function(provider) {
+ return provider.attribution;
+ }).join(", ");
};
- combobox.itemsMouseLeave = function(val) {
- if (!arguments.length)
- return _mouseLeaveHandler;
- _mouseLeaveHandler = val;
- return combobox;
+ bing.getMetadata = function(center, tileCoord, callback) {
+ var tileID = tileCoord.slice(0, 3).join("/");
+ var zoom = Math.min(tileCoord[2], 21);
+ var centerPoint = center[1] + "," + center[0];
+ var url2 = "https://dev.virtualearth.net/REST/v1/Imagery/BasicMetadata/AerialOSM/" + centerPoint + "?zl=" + zoom + "&key=" + key;
+ if (inflight[tileID]) return;
+ if (!cache[tileID]) {
+ cache[tileID] = {};
+ }
+ if (cache[tileID] && cache[tileID].metadata) {
+ return callback(null, cache[tileID].metadata);
+ }
+ inflight[tileID] = true;
+ if (metadataLastZoom !== tileCoord[2]) {
+ metadataLastZoom = tileCoord[2];
+ taskQueue.clear();
+ }
+ taskQueue.enqueue(() => {
+ json_default(url2).then(function(result) {
+ delete inflight[tileID];
+ if (!result) {
+ throw new Error("Unknown Error");
+ }
+ var vintage = {
+ start: localeDateString(result.resourceSets[0].resources[0].vintageStart),
+ end: localeDateString(result.resourceSets[0].resources[0].vintageEnd)
+ };
+ vintage.range = vintageRange(vintage);
+ var metadata = { vintage };
+ cache[tileID].metadata = metadata;
+ if (callback) callback(null, metadata);
+ }).catch(function(err) {
+ delete inflight[tileID];
+ if (callback) callback(err.message);
+ });
+ });
};
- return utilRebind(combobox, dispatch10, "on");
- }
- uiCombobox.off = function(input, context) {
- input.on("focus.combo-input", null).on("blur.combo-input", null).on("keydown.combo-input", null).on("keyup.combo-input", null).on("input.combo-input", null).on("mousedown.combo-input", null).on("mouseup.combo-input", null);
- context.container().on("scroll.combo-scroll", null);
+ bing.terms_url = "https://blog.openstreetmap.org/2010/11/30/microsoft-imagery-details";
+ return bing;
};
-
- // modules/ui/disclosure.js
- function uiDisclosure(context, key, expandedDefault) {
- var dispatch10 = dispatch_default("toggled");
- var _expanded;
- var _label = utilFunctor("");
- var _updatePreference = true;
- var _content = function() {
+ rendererBackgroundSource.Esri = function(data) {
+ if (data.template.match(/blankTile/) === null) {
+ data.template = data.template + "?blankTile=false";
+ }
+ var esri = rendererBackgroundSource(data);
+ var cache = {};
+ var inflight = {};
+ var _prevCenter;
+ esri.fetchTilemap = function(center) {
+ if (_prevCenter && geoSphericalDistance(center, _prevCenter) < 5e3) return;
+ _prevCenter = center;
+ var z2 = 20;
+ var dummyUrl = esri.url([1, 2, 3]);
+ var x2 = Math.floor((center[0] + 180) / 360 * Math.pow(2, z2));
+ var y2 = Math.floor((1 - Math.log(Math.tan(center[1] * Math.PI / 180) + 1 / Math.cos(center[1] * Math.PI / 180)) / Math.PI) / 2 * Math.pow(2, z2));
+ var tilemapUrl = dummyUrl.replace(/tile\/[0-9]+\/[0-9]+\/[0-9]+\?blankTile=false/, "tilemap") + "/" + z2 + "/" + y2 + "/" + x2 + "/8/8";
+ json_default(tilemapUrl).then(function(tilemap) {
+ if (!tilemap) {
+ throw new Error("Unknown Error");
+ }
+ var hasTiles = true;
+ for (var i3 = 0; i3 < tilemap.data.length; i3++) {
+ if (!tilemap.data[i3]) {
+ hasTiles = false;
+ break;
+ }
+ }
+ esri.zoomExtent[1] = hasTiles ? 22 : 19;
+ }).catch(function() {
+ });
};
- var disclosure = function(selection2) {
- if (_expanded === void 0 || _expanded === null) {
- var preference = corePreferences("disclosure." + key + ".expanded");
- _expanded = preference === null ? !!expandedDefault : preference === "true";
+ esri.getMetadata = function(center, tileCoord, callback) {
+ if (esri.id !== "EsriWorldImagery") {
+ return callback(null, {});
}
- var hideToggle = selection2.selectAll(".hide-toggle-" + key).data([0]);
- var hideToggleEnter = hideToggle.enter().append("h3").append("a").attr("role", "button").attr("href", "#").attr("class", "hide-toggle hide-toggle-" + key).call(svgIcon("", "pre-text", "hide-toggle-icon"));
- hideToggleEnter.append("span").attr("class", "hide-toggle-text");
- hideToggle = hideToggleEnter.merge(hideToggle);
- hideToggle.on("click", toggle).attr("title", _t(`icons.${_expanded ? "collapse" : "expand"}`)).attr("aria-expanded", _expanded).classed("expanded", _expanded);
- hideToggle.selectAll(".hide-toggle-text").html(_label());
- hideToggle.selectAll(".hide-toggle-icon").attr("xlink:href", _expanded ? "#iD-icon-down" : _mainLocalizer.textDirection() === "rtl" ? "#iD-icon-backward" : "#iD-icon-forward");
- var wrap2 = selection2.selectAll(".disclosure-wrap").data([0]);
- wrap2 = wrap2.enter().append("div").attr("class", "disclosure-wrap disclosure-wrap-" + key).merge(wrap2).classed("hide", !_expanded);
- if (_expanded) {
- wrap2.call(_content);
+ var tileID = tileCoord.slice(0, 3).join("/");
+ var zoom = Math.min(tileCoord[2], esri.zoomExtent[1]);
+ var centerPoint = center[0] + "," + center[1];
+ var unknown = _t("info_panels.background.unknown");
+ var vintage = {};
+ var metadata = {};
+ if (inflight[tileID]) return;
+ var url = "https://services.arcgisonline.com/arcgis/rest/services/World_Imagery/MapServer/4/query";
+ url += "?returnGeometry=false&geometry=" + centerPoint + "&inSR=4326&geometryType=esriGeometryPoint&outFields=*&f=json";
+ if (!cache[tileID]) {
+ cache[tileID] = {};
}
- function toggle(d3_event) {
- d3_event.preventDefault();
- _expanded = !_expanded;
- if (_updatePreference) {
- corePreferences("disclosure." + key + ".expanded", _expanded);
+ if (cache[tileID] && cache[tileID].metadata) {
+ return callback(null, cache[tileID].metadata);
+ }
+ inflight[tileID] = true;
+ json_default(url).then(function(result) {
+ delete inflight[tileID];
+ result = result.features.map((f2) => f2.attributes).filter((a2) => a2.MinMapLevel <= zoom && a2.MaxMapLevel >= zoom)[0];
+ if (!result) {
+ throw new Error("Unknown Error");
+ } else if (result.features && result.features.length < 1) {
+ throw new Error("No Results");
+ } else if (result.error && result.error.message) {
+ throw new Error(result.error.message);
}
- hideToggle.classed("expanded", _expanded).attr("aria-expanded", _expanded).attr("title", _t(`icons.${_expanded ? "collapse" : "expand"}`));
- hideToggle.selectAll(".hide-toggle-icon").attr("xlink:href", _expanded ? "#iD-icon-down" : _mainLocalizer.textDirection() === "rtl" ? "#iD-icon-backward" : "#iD-icon-forward");
- wrap2.call(uiToggle(_expanded));
- if (_expanded) {
- wrap2.call(_content);
+ var captureDate = localeDateString(result.SRC_DATE2);
+ vintage = {
+ start: captureDate,
+ end: captureDate,
+ range: captureDate
+ };
+ metadata = {
+ vintage,
+ source: clean2(result.NICE_NAME),
+ description: clean2(result.NICE_DESC),
+ resolution: clean2(+Number(result.SRC_RES).toFixed(4)),
+ accuracy: clean2(+Number(result.SRC_ACC).toFixed(4))
+ };
+ if (isFinite(metadata.resolution)) {
+ metadata.resolution += " m";
+ }
+ if (isFinite(metadata.accuracy)) {
+ metadata.accuracy += " m";
}
- dispatch10.call("toggled", this, _expanded);
+ cache[tileID].metadata = metadata;
+ if (callback) callback(null, metadata);
+ }).catch(function(err) {
+ delete inflight[tileID];
+ if (callback) callback(err.message);
+ });
+ function clean2(val) {
+ return String(val).trim() || unknown;
}
};
- disclosure.label = function(val) {
- if (!arguments.length)
- return _label;
- _label = utilFunctor(val);
- return disclosure;
- };
- disclosure.expanded = function(val) {
- if (!arguments.length)
- return _expanded;
- _expanded = val;
- return disclosure;
- };
- disclosure.updatePreference = function(val) {
- if (!arguments.length)
- return _updatePreference;
- _updatePreference = val;
- return disclosure;
- };
- disclosure.content = function(val) {
- if (!arguments.length)
- return _content;
- _content = val;
- return disclosure;
- };
- return utilRebind(disclosure, dispatch10, "on");
- }
-
- // modules/ui/section.js
- function uiSection(id2, context) {
- var _classes = utilFunctor("");
- var _shouldDisplay;
- var _content;
- var _disclosure;
- var _label;
- var _expandedByDefault = utilFunctor(true);
- var _disclosureContent;
- var _disclosureExpanded;
- var _containerSelection = select_default2(null);
- var section = {
- id: id2
+ return esri;
+ };
+ rendererBackgroundSource.None = function() {
+ var source = rendererBackgroundSource({ id: "none", template: "" });
+ source.name = function() {
+ return _t("background.none");
};
- section.classes = function(val) {
- if (!arguments.length)
- return _classes;
- _classes = utilFunctor(val);
- return section;
+ source.label = function() {
+ return _t.append("background.none");
};
- section.label = function(val) {
- if (!arguments.length)
- return _label;
- _label = utilFunctor(val);
- return section;
+ source.imageryUsed = function() {
+ return null;
};
- section.expandedByDefault = function(val) {
- if (!arguments.length)
- return _expandedByDefault;
- _expandedByDefault = utilFunctor(val);
- return section;
+ source.area = function() {
+ return -1;
};
- section.shouldDisplay = function(val) {
- if (!arguments.length)
- return _shouldDisplay;
- _shouldDisplay = utilFunctor(val);
- return section;
+ return source;
+ };
+ rendererBackgroundSource.Custom = function(template) {
+ var source = rendererBackgroundSource({ id: "custom", template });
+ source.name = function() {
+ return _t("background.custom");
};
- section.content = function(val) {
- if (!arguments.length)
- return _content;
- _content = val;
- return section;
+ source.label = function() {
+ return _t.append("background.custom");
};
- section.disclosureContent = function(val) {
- if (!arguments.length)
- return _disclosureContent;
- _disclosureContent = val;
- return section;
+ source.imageryUsed = function() {
+ var cleaned = source.template();
+ if (cleaned.indexOf("?") !== -1) {
+ var parts = cleaned.split("?", 2);
+ var qs = utilStringQs(parts[1]);
+ ["access_token", "connectId", "token", "Signature"].forEach(function(param) {
+ if (qs[param]) {
+ qs[param] = "{apikey}";
+ }
+ });
+ cleaned = parts[0] + "?" + utilQsString(qs, true);
+ }
+ cleaned = cleaned.replace(/token\/(\w+)/, "token/{apikey}").replace(/key=(\w+)/, "key={apikey}");
+ return "Custom (" + cleaned + " )";
};
- section.disclosureExpanded = function(val) {
- if (!arguments.length)
- return _disclosureExpanded;
- _disclosureExpanded = val;
- return section;
+ source.area = function() {
+ return -2;
};
- section.render = function(selection2) {
- _containerSelection = selection2.selectAll(".section-" + id2).data([0]);
- var sectionEnter = _containerSelection.enter().append("div").attr("class", "section section-" + id2 + " " + (_classes && _classes() || ""));
- _containerSelection = sectionEnter.merge(_containerSelection);
- _containerSelection.call(renderContent);
+ return source;
+ };
+
+ // node_modules/@turf/helpers/dist/esm/index.js
+ var earthRadius = 63710088e-1;
+ var factors = {
+ centimeters: earthRadius * 100,
+ centimetres: earthRadius * 100,
+ degrees: 360 / (2 * Math.PI),
+ feet: earthRadius * 3.28084,
+ inches: earthRadius * 39.37,
+ kilometers: earthRadius / 1e3,
+ kilometres: earthRadius / 1e3,
+ meters: earthRadius,
+ metres: earthRadius,
+ miles: earthRadius / 1609.344,
+ millimeters: earthRadius * 1e3,
+ millimetres: earthRadius * 1e3,
+ nauticalmiles: earthRadius / 1852,
+ radians: 1,
+ yards: earthRadius * 1.0936
+ };
+ function feature2(geom, properties, options2 = {}) {
+ const feat = { type: "Feature" };
+ if (options2.id === 0 || options2.id) {
+ feat.id = options2.id;
+ }
+ if (options2.bbox) {
+ feat.bbox = options2.bbox;
+ }
+ feat.properties = properties || {};
+ feat.geometry = geom;
+ return feat;
+ }
+ function polygon(coordinates, properties, options2 = {}) {
+ for (const ring of coordinates) {
+ if (ring.length < 4) {
+ throw new Error(
+ "Each LinearRing of a Polygon must have 4 or more Positions."
+ );
+ }
+ if (ring[ring.length - 1].length !== ring[0].length) {
+ throw new Error("First and last Position are not equivalent.");
+ }
+ for (let j2 = 0; j2 < ring[ring.length - 1].length; j2++) {
+ if (ring[ring.length - 1][j2] !== ring[0][j2]) {
+ throw new Error("First and last Position are not equivalent.");
+ }
+ }
+ }
+ const geom = {
+ type: "Polygon",
+ coordinates
};
- section.reRender = function() {
- _containerSelection.call(renderContent);
+ return feature2(geom, properties, options2);
+ }
+ function lineString(coordinates, properties, options2 = {}) {
+ if (coordinates.length < 2) {
+ throw new Error("coordinates must be an array of two or more positions");
+ }
+ const geom = {
+ type: "LineString",
+ coordinates
};
- section.selection = function() {
- return _containerSelection;
+ return feature2(geom, properties, options2);
+ }
+ function multiLineString(coordinates, properties, options2 = {}) {
+ const geom = {
+ type: "MultiLineString",
+ coordinates
};
- section.disclosure = function() {
- return _disclosure;
+ return feature2(geom, properties, options2);
+ }
+ function multiPolygon(coordinates, properties, options2 = {}) {
+ const geom = {
+ type: "MultiPolygon",
+ coordinates
};
- function renderContent(selection2) {
- if (_shouldDisplay) {
- var shouldDisplay = _shouldDisplay();
- selection2.classed("hide", !shouldDisplay);
- if (!shouldDisplay) {
- selection2.html("");
- return;
+ return feature2(geom, properties, options2);
+ }
+
+ // node_modules/@turf/invariant/dist/esm/index.js
+ function getGeom(geojson) {
+ if (geojson.type === "Feature") {
+ return geojson.geometry;
+ }
+ return geojson;
+ }
+
+ // node_modules/@turf/bbox-clip/dist/esm/index.js
+ function lineclip(points, bbox2, result) {
+ var len = points.length, codeA = bitCode(points[0], bbox2), part = [], i3, codeB, lastCode;
+ let a2;
+ let b2;
+ if (!result) result = [];
+ for (i3 = 1; i3 < len; i3++) {
+ a2 = points[i3 - 1];
+ b2 = points[i3];
+ codeB = lastCode = bitCode(b2, bbox2);
+ while (true) {
+ if (!(codeA | codeB)) {
+ part.push(a2);
+ if (codeB !== lastCode) {
+ part.push(b2);
+ if (i3 < len - 1) {
+ result.push(part);
+ part = [];
+ }
+ } else if (i3 === len - 1) {
+ part.push(b2);
+ }
+ break;
+ } else if (codeA & codeB) {
+ break;
+ } else if (codeA) {
+ a2 = intersect(a2, b2, codeA, bbox2);
+ codeA = bitCode(a2, bbox2);
+ } else {
+ b2 = intersect(a2, b2, codeB, bbox2);
+ codeB = bitCode(b2, bbox2);
}
}
- if (_disclosureContent) {
- if (!_disclosure) {
- _disclosure = uiDisclosure(context, id2.replace(/-/g, "_"), _expandedByDefault()).label(_label || "").content(_disclosureContent);
+ codeA = lastCode;
+ }
+ if (part.length) result.push(part);
+ return result;
+ }
+ function polygonclip(points, bbox2) {
+ var result, edge, prev, prevInside, i3, p2, inside;
+ for (edge = 1; edge <= 8; edge *= 2) {
+ result = [];
+ prev = points[points.length - 1];
+ prevInside = !(bitCode(prev, bbox2) & edge);
+ for (i3 = 0; i3 < points.length; i3++) {
+ p2 = points[i3];
+ inside = !(bitCode(p2, bbox2) & edge);
+ if (inside !== prevInside) result.push(intersect(prev, p2, edge, bbox2));
+ if (inside) result.push(p2);
+ prev = p2;
+ prevInside = inside;
+ }
+ points = result;
+ if (!points.length) break;
+ }
+ return result;
+ }
+ function intersect(a2, b2, edge, bbox2) {
+ return edge & 8 ? [a2[0] + (b2[0] - a2[0]) * (bbox2[3] - a2[1]) / (b2[1] - a2[1]), bbox2[3]] : edge & 4 ? [a2[0] + (b2[0] - a2[0]) * (bbox2[1] - a2[1]) / (b2[1] - a2[1]), bbox2[1]] : edge & 2 ? [bbox2[2], a2[1] + (b2[1] - a2[1]) * (bbox2[2] - a2[0]) / (b2[0] - a2[0])] : edge & 1 ? [bbox2[0], a2[1] + (b2[1] - a2[1]) * (bbox2[0] - a2[0]) / (b2[0] - a2[0])] : null;
+ }
+ function bitCode(p2, bbox2) {
+ var code = 0;
+ if (p2[0] < bbox2[0]) code |= 1;
+ else if (p2[0] > bbox2[2]) code |= 2;
+ if (p2[1] < bbox2[1]) code |= 4;
+ else if (p2[1] > bbox2[3]) code |= 8;
+ return code;
+ }
+ function bboxClip(feature3, bbox2) {
+ const geom = getGeom(feature3);
+ const type2 = geom.type;
+ const properties = feature3.type === "Feature" ? feature3.properties : {};
+ let coords = geom.coordinates;
+ switch (type2) {
+ case "LineString":
+ case "MultiLineString": {
+ const lines = [];
+ if (type2 === "LineString") {
+ coords = [coords];
}
- if (_disclosureExpanded !== void 0) {
- _disclosure.expanded(_disclosureExpanded);
- _disclosureExpanded = void 0;
+ coords.forEach((line) => {
+ lineclip(line, bbox2, lines);
+ });
+ if (lines.length === 1) {
+ return lineString(lines[0], properties);
}
- selection2.call(_disclosure);
- return;
+ return multiLineString(lines, properties);
}
- if (_content) {
- selection2.call(_content);
+ case "Polygon":
+ return polygon(clipPolygon(coords, bbox2), properties);
+ case "MultiPolygon":
+ return multiPolygon(
+ coords.map((poly) => {
+ return clipPolygon(poly, bbox2);
+ }),
+ properties
+ );
+ default:
+ throw new Error("geometry " + type2 + " not supported");
+ }
+ }
+ function clipPolygon(rings, bbox2) {
+ const outRings = [];
+ for (const ring of rings) {
+ const clipped = polygonclip(ring, bbox2);
+ if (clipped.length > 0) {
+ if (clipped[0][0] !== clipped[clipped.length - 1][0] || clipped[0][1] !== clipped[clipped.length - 1][1]) {
+ clipped.push(clipped[0]);
+ }
+ if (clipped.length >= 4) {
+ outRings.push(clipped);
+ }
+ }
+ }
+ return outRings;
+ }
+ var turf_bbox_clip_default = bboxClip;
+
+ // node_modules/@turf/meta/dist/esm/index.js
+ function coordEach(geojson, callback, excludeWrapCoord) {
+ if (geojson === null) return;
+ var j2, k2, l2, geometry, stopG, coords, geometryMaybeCollection, wrapShrink = 0, coordIndex = 0, isGeometryCollection, type2 = geojson.type, isFeatureCollection = type2 === "FeatureCollection", isFeature = type2 === "Feature", stop = isFeatureCollection ? geojson.features.length : 1;
+ for (var featureIndex = 0; featureIndex < stop; featureIndex++) {
+ geometryMaybeCollection = isFeatureCollection ? geojson.features[featureIndex].geometry : isFeature ? geojson.geometry : geojson;
+ isGeometryCollection = geometryMaybeCollection ? geometryMaybeCollection.type === "GeometryCollection" : false;
+ stopG = isGeometryCollection ? geometryMaybeCollection.geometries.length : 1;
+ for (var geomIndex = 0; geomIndex < stopG; geomIndex++) {
+ var multiFeatureIndex = 0;
+ var geometryIndex = 0;
+ geometry = isGeometryCollection ? geometryMaybeCollection.geometries[geomIndex] : geometryMaybeCollection;
+ if (geometry === null) continue;
+ coords = geometry.coordinates;
+ var geomType = geometry.type;
+ wrapShrink = excludeWrapCoord && (geomType === "Polygon" || geomType === "MultiPolygon") ? 1 : 0;
+ switch (geomType) {
+ case null:
+ break;
+ case "Point":
+ if (callback(
+ coords,
+ coordIndex,
+ featureIndex,
+ multiFeatureIndex,
+ geometryIndex
+ ) === false)
+ return false;
+ coordIndex++;
+ multiFeatureIndex++;
+ break;
+ case "LineString":
+ case "MultiPoint":
+ for (j2 = 0; j2 < coords.length; j2++) {
+ if (callback(
+ coords[j2],
+ coordIndex,
+ featureIndex,
+ multiFeatureIndex,
+ geometryIndex
+ ) === false)
+ return false;
+ coordIndex++;
+ if (geomType === "MultiPoint") multiFeatureIndex++;
+ }
+ if (geomType === "LineString") multiFeatureIndex++;
+ break;
+ case "Polygon":
+ case "MultiLineString":
+ for (j2 = 0; j2 < coords.length; j2++) {
+ for (k2 = 0; k2 < coords[j2].length - wrapShrink; k2++) {
+ if (callback(
+ coords[j2][k2],
+ coordIndex,
+ featureIndex,
+ multiFeatureIndex,
+ geometryIndex
+ ) === false)
+ return false;
+ coordIndex++;
+ }
+ if (geomType === "MultiLineString") multiFeatureIndex++;
+ if (geomType === "Polygon") geometryIndex++;
+ }
+ if (geomType === "Polygon") multiFeatureIndex++;
+ break;
+ case "MultiPolygon":
+ for (j2 = 0; j2 < coords.length; j2++) {
+ geometryIndex = 0;
+ for (k2 = 0; k2 < coords[j2].length; k2++) {
+ for (l2 = 0; l2 < coords[j2][k2].length - wrapShrink; l2++) {
+ if (callback(
+ coords[j2][k2][l2],
+ coordIndex,
+ featureIndex,
+ multiFeatureIndex,
+ geometryIndex
+ ) === false)
+ return false;
+ coordIndex++;
+ }
+ geometryIndex++;
+ }
+ multiFeatureIndex++;
+ }
+ break;
+ case "GeometryCollection":
+ for (j2 = 0; j2 < geometry.geometries.length; j2++)
+ if (coordEach(geometry.geometries[j2], callback, excludeWrapCoord) === false)
+ return false;
+ break;
+ default:
+ throw new Error("Unknown Geometry Type");
+ }
}
}
- return section;
}
- // modules/ui/tag_reference.js
- function uiTagReference(what) {
- var wikibase = what.qid ? services.wikidata : services.osmWikibase;
- var tagReference = {};
- var _button = select_default2(null);
- var _body = select_default2(null);
- var _loaded;
- var _showing;
- function load() {
- if (!wikibase)
- return;
- _button.classed("tag-reference-loading", true);
- wikibase.getDocs(what, gotDocs);
+ // node_modules/@turf/bbox/dist/esm/index.js
+ function bbox(geojson, options2 = {}) {
+ if (geojson.bbox != null && true !== options2.recompute) {
+ return geojson.bbox;
}
- function gotDocs(err, docs) {
- _body.html("");
- if (!docs || !docs.title) {
- _body.append("p").attr("class", "tag-reference-description").call(_t.append("inspector.no_documentation_key"));
- done();
- return;
+ const result = [Infinity, Infinity, -Infinity, -Infinity];
+ coordEach(geojson, (coord2) => {
+ if (result[0] > coord2[0]) {
+ result[0] = coord2[0];
}
- if (docs.imageURL) {
- _body.append("img").attr("class", "tag-reference-wiki-image").attr("alt", docs.description).attr("src", docs.imageURL).on("load", function() {
- done();
- }).on("error", function() {
- select_default2(this).remove();
- done();
- });
- } else {
- done();
+ if (result[1] > coord2[1]) {
+ result[1] = coord2[1];
}
- var tagReferenceDescription = _body.append("p").attr("class", "tag-reference-description").append("span");
- if (docs.description) {
- tagReferenceDescription = tagReferenceDescription.attr("class", "localized-text").attr("lang", docs.descriptionLocaleCode || "und").text(docs.description);
- } else {
- tagReferenceDescription = tagReferenceDescription.call(_t.append("inspector.no_documentation_key"));
+ if (result[2] < coord2[0]) {
+ result[2] = coord2[0];
}
- tagReferenceDescription.append("a").attr("class", "tag-reference-edit").attr("target", "_blank").attr("title", _t("inspector.edit_reference")).attr("href", docs.editURL).call(svgIcon("#iD-icon-edit", "inline"));
- if (docs.wiki) {
- _body.append("a").attr("class", "tag-reference-link").attr("target", "_blank").attr("href", docs.wiki.url).call(svgIcon("#iD-icon-out-link", "inline")).append("span").call(_t.append(docs.wiki.text));
+ if (result[3] < coord2[1]) {
+ result[3] = coord2[1];
}
- if (what.key === "comment") {
- _body.append("a").attr("class", "tag-reference-comment-link").attr("target", "_blank").call(svgIcon("#iD-icon-out-link", "inline")).attr("href", _t("commit.about_changeset_comments_link")).append("span").call(_t.append("commit.about_changeset_comments"));
+ });
+ return result;
+ }
+ var turf_bbox_default = bbox;
+
+ // modules/renderer/background.js
+ var import_which_polygon3 = __toESM(require_which_polygon());
+
+ // modules/renderer/tile_layer.js
+ function rendererTileLayer(context) {
+ var transformProp = utilPrefixCSSProperty("Transform");
+ var tiler8 = utilTiler();
+ var _tileSize = 256;
+ var _projection;
+ var _cache5 = {};
+ var _tileOrigin;
+ var _zoom;
+ var _source;
+ var _underzoom = 0;
+ var _epsilon = 0;
+ if (window.chrome) {
+ updateEpsilon();
+ window.addEventListener("resize", updateEpsilon);
+ }
+ function updateEpsilon() {
+ const pageZoom = Math.round(window.devicePixelRatio * 100);
+ if (pageZoom % 25 === 0) {
+ _epsilon = 0;
+ } else if (pageZoom === 90) {
+ _epsilon = 5e-3;
+ } else if (pageZoom === 110) {
+ _epsilon = 2e-3;
+ } else {
+ _epsilon = 3e-3;
}
}
- function done() {
- _loaded = true;
- _button.classed("tag-reference-loading", false);
- _body.classed("expanded", true).transition().duration(200).style("max-height", "200px").style("opacity", "1");
- _showing = true;
- _button.selectAll("svg.icon use").each(function() {
- var iconUse = select_default2(this);
- if (iconUse.attr("href") === "#iD-icon-info") {
- iconUse.attr("href", "#iD-icon-info-filled");
- }
- });
+ function tileSizeAtZoom(d2, z2) {
+ return d2.tileSize * Math.pow(2, z2 - d2[2]) / d2.tileSize + _epsilon;
}
- function hide() {
- _body.transition().duration(200).style("max-height", "0px").style("opacity", "0").on("end", function() {
- _body.classed("expanded", false);
- });
- _showing = false;
- _button.selectAll("svg.icon use").each(function() {
- var iconUse = select_default2(this);
- if (iconUse.attr("href") === "#iD-icon-info-filled") {
- iconUse.attr("href", "#iD-icon-info");
- }
- });
+ function atZoom(t2, distance) {
+ var power = Math.pow(2, distance);
+ return [
+ Math.floor(t2[0] * power),
+ Math.floor(t2[1] * power),
+ t2[2] + distance
+ ];
}
- tagReference.button = function(selection2, klass, iconName) {
- _button = selection2.selectAll(".tag-reference-button").data([0]);
- _button = _button.enter().append("button").attr("class", "tag-reference-button " + (klass || "")).attr("title", _t("icons.information")).call(svgIcon("#iD-icon-" + (iconName || "inspect"))).merge(_button);
- _button.on("click", function(d3_event) {
- d3_event.stopPropagation();
- d3_event.preventDefault();
- this.blur();
- if (_showing) {
- hide();
- } else if (_loaded) {
- done();
- } else {
- load();
+ function lookUp(d2) {
+ for (var up = -1; up > -d2[2]; up--) {
+ var tile = atZoom(d2, up);
+ if (_cache5[_source.url(tile)] !== false) {
+ return tile;
}
- });
- };
- tagReference.body = function(selection2) {
- var itemID = what.qid || what.key + "-" + (what.value || "");
- _body = selection2.selectAll(".tag-reference-body").data([itemID], function(d) {
- return d;
- });
- _body.exit().remove();
- _body = _body.enter().append("div").attr("class", "tag-reference-body").style("max-height", "0").style("opacity", "0").merge(_body);
- if (_showing === false) {
- hide();
}
- };
- tagReference.showing = function(val) {
- if (!arguments.length)
- return _showing;
- _showing = val;
- return tagReference;
- };
- return tagReference;
- }
-
- // modules/ui/field_help.js
- function uiFieldHelp(context, fieldName) {
- var fieldHelp = {};
- var _inspector = select_default2(null);
- var _wrap = select_default2(null);
- var _body = select_default2(null);
- var fieldHelpKeys = {
- restrictions: [
- ["about", [
- "about",
- "from_via_to",
- "maxdist",
- "maxvia"
- ]],
- ["inspecting", [
- "about",
- "from_shadow",
- "allow_shadow",
- "restrict_shadow",
- "only_shadow",
- "restricted",
- "only"
- ]],
- ["modifying", [
- "about",
- "indicators",
- "allow_turn",
- "restrict_turn",
- "only_turn"
- ]],
- ["tips", [
- "simple",
- "simple_example",
- "indirect",
- "indirect_example",
- "indirect_noedit"
- ]]
- ]
- };
- var fieldHelpHeadings = {};
- var replacements = {
- distField: { html: _t.html("restriction.controls.distance") },
- viaField: { html: _t.html("restriction.controls.via") },
- fromShadow: { html: icon("#iD-turn-shadow", "inline shadow from") },
- allowShadow: { html: icon("#iD-turn-shadow", "inline shadow allow") },
- restrictShadow: { html: icon("#iD-turn-shadow", "inline shadow restrict") },
- onlyShadow: { html: icon("#iD-turn-shadow", "inline shadow only") },
- allowTurn: { html: icon("#iD-turn-yes", "inline turn") },
- restrictTurn: { html: icon("#iD-turn-no", "inline turn") },
- onlyTurn: { html: icon("#iD-turn-only", "inline turn") }
- };
- var docs = fieldHelpKeys[fieldName].map(function(key) {
- var helpkey = "help.field." + fieldName + "." + key[0];
- var text2 = key[1].reduce(function(all, part) {
- var subkey = helpkey + "." + part;
- var depth = fieldHelpHeadings[subkey];
- var hhh = depth ? Array(depth + 1).join("#") + " " : "";
- return all + hhh + _t.html(subkey, replacements) + "\n\n";
- }, "");
- return {
- key: helpkey,
- title: _t.html(helpkey + ".title"),
- html: marked(text2.trim())
- };
- });
- function show() {
- updatePosition();
- _body.classed("hide", false).style("opacity", "0").transition().duration(200).style("opacity", "1");
- }
- function hide() {
- _body.classed("hide", true).transition().duration(200).style("opacity", "0").on("end", function() {
- _body.classed("hide", true);
- });
}
- function clickHelp(index) {
- var d = docs[index];
- var tkeys = fieldHelpKeys[fieldName][index][1];
- _body.selectAll(".field-help-nav-item").classed("active", function(d2, i2) {
- return i2 === index;
- });
- var content = _body.selectAll(".field-help-content").html(d.html);
- content.selectAll("p").attr("class", function(d2, i2) {
- return tkeys[i2];
- });
- if (d.key === "help.field.restrictions.inspecting") {
- content.insert("img", "p.from_shadow").attr("class", "field-help-image cf").attr("src", context.imagePath("tr_inspect.gif"));
- } else if (d.key === "help.field.restrictions.modifying") {
- content.insert("img", "p.allow_turn").attr("class", "field-help-image cf").attr("src", context.imagePath("tr_modify.gif"));
+ function uniqueBy(a2, n3) {
+ var o2 = [];
+ var seen = {};
+ for (var i3 = 0; i3 < a2.length; i3++) {
+ if (seen[a2[i3][n3]] === void 0) {
+ o2.push(a2[i3]);
+ seen[a2[i3][n3]] = true;
+ }
}
+ return o2;
}
- fieldHelp.button = function(selection2) {
- if (_body.empty())
- return;
- var button = selection2.selectAll(".field-help-button").data([0]);
- button.enter().append("button").attr("class", "field-help-button").call(svgIcon("#iD-icon-help")).merge(button).on("click", function(d3_event) {
- d3_event.stopPropagation();
- d3_event.preventDefault();
- if (_body.classed("hide")) {
- show();
- } else {
- hide();
- }
- });
- };
- function updatePosition() {
- var wrap2 = _wrap.node();
- var inspector = _inspector.node();
- var wRect = wrap2.getBoundingClientRect();
- var iRect = inspector.getBoundingClientRect();
- _body.style("top", wRect.top + inspector.scrollTop - iRect.top + "px");
+ function addSource(d2) {
+ d2.url = _source.url(d2);
+ d2.tileSize = _tileSize;
+ return d2;
}
- fieldHelp.body = function(selection2) {
- _wrap = selection2.selectAll(".form-field-input-wrap");
- if (_wrap.empty())
- return;
- _inspector = context.container().select(".sidebar .entity-editor-pane .inspector-body");
- if (_inspector.empty())
- return;
- _body = _inspector.selectAll(".field-help-body").data([0]);
- var enter = _body.enter().append("div").attr("class", "field-help-body hide");
- var titleEnter = enter.append("div").attr("class", "field-help-title cf");
- titleEnter.append("h2").attr("class", _mainLocalizer.textDirection() === "rtl" ? "fr" : "fl").call(_t.append("help.field." + fieldName + ".title"));
- titleEnter.append("button").attr("class", "fr close").attr("title", _t("icons.close")).on("click", function(d3_event) {
- d3_event.stopPropagation();
- d3_event.preventDefault();
- hide();
- }).call(svgIcon("#iD-icon-close"));
- var navEnter = enter.append("div").attr("class", "field-help-nav cf");
- var titles = docs.map(function(d) {
- return d.title;
- });
- navEnter.selectAll(".field-help-nav-item").data(titles).enter().append("div").attr("class", "field-help-nav-item").html(function(d) {
- return d;
- }).on("click", function(d3_event, d) {
- d3_event.stopPropagation();
- d3_event.preventDefault();
- clickHelp(titles.indexOf(d));
- });
- enter.append("div").attr("class", "field-help-content");
- _body = _body.merge(enter);
- clickHelp(0);
- };
- return fieldHelp;
- }
-
- // modules/ui/fields/check.js
- function uiFieldCheck(field, context) {
- var dispatch10 = dispatch_default("change");
- var options2 = field.options;
- var values = [];
- var texts = [];
- var _tags;
- var input = select_default2(null);
- var text2 = select_default2(null);
- var label = select_default2(null);
- var reverser = select_default2(null);
- var _impliedYes;
- var _entityIDs = [];
- var _value;
- if (options2) {
- for (var i2 in options2) {
- var v = options2[i2];
- values.push(v === "undefined" ? void 0 : v);
- texts.push(field.t.html("options." + v, { "default": v }));
- }
- } else {
- values = [void 0, "yes"];
- texts = [_t.html("inspector.unknown"), _t.html("inspector.check.yes")];
- if (field.type !== "defaultCheck") {
- values.push("no");
- texts.push(_t.html("inspector.check.no"));
+ function background(selection2) {
+ _zoom = geoScaleToZoom(_projection.scale(), _tileSize);
+ var pixelOffset;
+ if (_source) {
+ pixelOffset = [
+ _source.offset()[0] * Math.pow(2, _zoom),
+ _source.offset()[1] * Math.pow(2, _zoom)
+ ];
+ } else {
+ pixelOffset = [0, 0];
}
+ var translate = [
+ _projection.translate()[0] + pixelOffset[0],
+ _projection.translate()[1] + pixelOffset[1]
+ ];
+ tiler8.scale(_projection.scale() * 2 * Math.PI).translate(translate);
+ _tileOrigin = [
+ _projection.scale() * Math.PI - translate[0],
+ _projection.scale() * Math.PI - translate[1]
+ ];
+ render(selection2);
}
- function checkImpliedYes() {
- _impliedYes = field.id === "oneway_yes";
- if (field.id === "oneway") {
- var entity = context.entity(_entityIDs[0]);
- for (var key in entity.tags) {
- if (key in osmOneWayTags && entity.tags[key] in osmOneWayTags[key]) {
- _impliedYes = true;
- texts[0] = _t.html("_tagging.presets.fields.oneway_yes.options.undefined");
- break;
+ function render(selection2) {
+ if (!_source) return;
+ var requests = [];
+ var showDebug = context.getDebug("tile") && !_source.overlay;
+ if (_source.validZoom(_zoom, _underzoom)) {
+ tiler8.skipNullIsland(!!_source.overlay);
+ tiler8().forEach(function(d2) {
+ addSource(d2);
+ if (d2.url === "") return;
+ if (typeof d2.url !== "string") return;
+ requests.push(d2);
+ if (_cache5[d2.url] === false && lookUp(d2)) {
+ requests.push(addSource(lookUp(d2)));
}
- }
+ });
+ requests = uniqueBy(requests, "url").filter(function(r2) {
+ return _cache5[r2.url] !== false;
+ });
}
- }
- function reverserHidden() {
- if (!context.container().select("div.inspector-hover").empty())
- return true;
- return !(_value === "yes" || _impliedYes && !_value);
- }
- function reverserSetText(selection2) {
- var entity = _entityIDs.length && context.hasEntity(_entityIDs[0]);
- if (reverserHidden() || !entity)
- return selection2;
- var first = entity.first();
- var last = entity.isClosed() ? entity.nodes[entity.nodes.length - 2] : entity.last();
- var pseudoDirection = first < last;
- var icon2 = pseudoDirection ? "#iD-icon-forward" : "#iD-icon-backward";
- selection2.selectAll(".reverser-span").html("").call(_t.append("inspector.check.reverser")).call(svgIcon(icon2, "inline"));
- return selection2;
- }
- var check = function(selection2) {
- checkImpliedYes();
- label = selection2.selectAll(".form-field-input-wrap").data([0]);
- var enter = label.enter().append("label").attr("class", "form-field-input-wrap form-field-input-check");
- enter.append("input").property("indeterminate", field.type !== "defaultCheck").attr("type", "checkbox").attr("id", field.domId);
- enter.append("span").html(texts[0]).attr("class", "value");
- if (field.type === "onewayCheck") {
- enter.append("button").attr("class", "reverser" + (reverserHidden() ? " hide" : "")).append("span").attr("class", "reverser-span");
+ function load(d3_event, d2) {
+ _cache5[d2.url] = true;
+ select_default2(this).on("error", null).on("load", null);
+ render(selection2);
+ }
+ function error(d3_event, d2) {
+ _cache5[d2.url] = false;
+ select_default2(this).on("error", null).on("load", null).remove();
+ render(selection2);
+ }
+ function imageTransform(d2) {
+ var ts = d2.tileSize * Math.pow(2, _zoom - d2[2]);
+ var scale = tileSizeAtZoom(d2, _zoom);
+ return "translate(" + (d2[0] * ts * _tileSize / d2.tileSize - _tileOrigin[0]) + "px," + (d2[1] * ts * _tileSize / d2.tileSize - _tileOrigin[1]) + "px) scale(" + scale * _tileSize / d2.tileSize + "," + scale * _tileSize / d2.tileSize + ")";
+ }
+ function tileCenter(d2) {
+ var ts = d2.tileSize * Math.pow(2, _zoom - d2[2]);
+ return [
+ d2[0] * ts - _tileOrigin[0] + ts / 2,
+ d2[1] * ts - _tileOrigin[1] + ts / 2
+ ];
}
- label = label.merge(enter);
- input = label.selectAll("input");
- text2 = label.selectAll("span.value");
- input.on("click", function(d3_event) {
- d3_event.stopPropagation();
- var t = {};
- if (Array.isArray(_tags[field.key])) {
- if (values.indexOf("yes") !== -1) {
- t[field.key] = "yes";
- } else {
- t[field.key] = values[0];
- }
- } else {
- t[field.key] = values[(values.indexOf(_value) + 1) % values.length];
- }
- if (t[field.key] === "reversible" || t[field.key] === "alternating") {
- t[field.key] = values[0];
+ function debugTransform(d2) {
+ var coord2 = tileCenter(d2);
+ return "translate(" + coord2[0] + "px," + coord2[1] + "px)";
+ }
+ var dims = tiler8.size();
+ var mapCenter = [dims[0] / 2, dims[1] / 2];
+ var minDist = Math.max(dims[0], dims[1]);
+ var nearCenter;
+ requests.forEach(function(d2) {
+ var c2 = tileCenter(d2);
+ var dist = geoVecLength(c2, mapCenter);
+ if (dist < minDist) {
+ minDist = dist;
+ nearCenter = d2;
}
- dispatch10.call("change", this, t);
});
- if (field.type === "onewayCheck") {
- reverser = label.selectAll(".reverser");
- reverser.call(reverserSetText).on("click", function(d3_event) {
- d3_event.preventDefault();
- d3_event.stopPropagation();
- context.perform(function(graph) {
- for (var i3 in _entityIDs) {
- graph = actionReverse(_entityIDs[i3])(graph);
+ var image = selection2.selectAll("img").data(requests, function(d2) {
+ return d2.url;
+ });
+ image.exit().style(transformProp, imageTransform).classed("tile-removing", true).classed("tile-center", false).each(function() {
+ var tile = select_default2(this);
+ window.setTimeout(function() {
+ if (tile.classed("tile-removing")) {
+ tile.remove();
+ }
+ }, 250);
+ });
+ image.enter().append("img").attr("class", "tile").attr("alt", "").attr("draggable", "false").style("width", _tileSize + "px").style("height", _tileSize + "px").attr("src", function(d2) {
+ return d2.url;
+ }).on("error", error).on("load", load).merge(image).style(transformProp, imageTransform).classed("tile-debug", showDebug).classed("tile-removing", false).classed("tile-center", function(d2) {
+ return d2 === nearCenter;
+ });
+ var debug2 = selection2.selectAll(".tile-label-debug").data(showDebug ? requests : [], function(d2) {
+ return d2.url;
+ });
+ debug2.exit().remove();
+ if (showDebug) {
+ var debugEnter = debug2.enter().append("div").attr("class", "tile-label-debug");
+ debugEnter.append("div").attr("class", "tile-label-debug-coord");
+ debugEnter.append("div").attr("class", "tile-label-debug-vintage");
+ debug2 = debug2.merge(debugEnter);
+ debug2.style(transformProp, debugTransform);
+ debug2.selectAll(".tile-label-debug-coord").text(function(d2) {
+ return d2[2] + " / " + d2[0] + " / " + d2[1];
+ });
+ debug2.selectAll(".tile-label-debug-vintage").each(function(d2) {
+ var span = select_default2(this);
+ var center = context.projection.invert(tileCenter(d2));
+ _source.getMetadata(center, d2, function(err, result) {
+ if (result && result.vintage && result.vintage.range) {
+ span.text(result.vintage.range);
+ } else {
+ span.text("");
+ span.call(_t.append("info_panels.background.vintage"));
+ span.append("span").text(": ");
+ span.call(_t.append("info_panels.background.unknown"));
}
- return graph;
- }, _t("operations.reverse.annotation.line", { n: 1 }));
- context.validator().validate();
- select_default2(this).call(reverserSetText);
+ });
});
}
+ }
+ background.projection = function(val) {
+ if (!arguments.length) return _projection;
+ _projection = val;
+ return background;
};
- check.entityIDs = function(val) {
- if (!arguments.length)
- return _entityIDs;
- _entityIDs = val;
- return check;
+ background.dimensions = function(val) {
+ if (!arguments.length) return tiler8.size();
+ tiler8.size(val);
+ return background;
};
- check.tags = function(tags) {
- _tags = tags;
- function isChecked(val) {
- return val !== "no" && val !== "" && val !== void 0 && val !== null;
- }
- function textFor(val) {
- if (val === "")
- val = void 0;
- var index = values.indexOf(val);
- return index !== -1 ? texts[index] : '"' + val + '"';
- }
- checkImpliedYes();
- var isMixed = Array.isArray(tags[field.key]);
- _value = !isMixed && tags[field.key] && tags[field.key].toLowerCase();
- if (field.type === "onewayCheck" && (_value === "1" || _value === "-1")) {
- _value = "yes";
- }
- input.property("indeterminate", isMixed || field.type !== "defaultCheck" && !_value).property("checked", isChecked(_value));
- text2.html(isMixed ? _t.html("inspector.multiple_values") : textFor(_value)).classed("mixed", isMixed);
- label.classed("set", !!_value);
- if (field.type === "onewayCheck") {
- reverser.classed("hide", reverserHidden()).call(reverserSetText);
- }
+ background.source = function(val) {
+ if (!arguments.length) return _source;
+ _source = val;
+ _tileSize = _source.tileSize;
+ _cache5 = {};
+ tiler8.tileSize(_source.tileSize).zoomExtent(_source.zoomExtent);
+ return background;
};
- check.focus = function() {
- input.node().focus();
+ background.underzoom = function(amount) {
+ if (!arguments.length) return _underzoom;
+ _underzoom = amount;
+ return background;
};
- return utilRebind(check, dispatch10, "on");
+ return background;
}
- // modules/ui/fields/combo.js
- function uiFieldCombo(field, context) {
- var dispatch10 = dispatch_default("change");
- var _isMulti = field.type === "multiCombo" || field.type === "manyCombo";
- var _isNetwork = field.type === "networkCombo";
- var _isSemi = field.type === "semiCombo";
- var _optarray = field.options;
- var _showTagInfoSuggestions = field.type !== "manyCombo" && field.autoSuggestions !== false;
- var _allowCustomValues = field.type !== "manyCombo" && field.customValues !== false;
- var _snake_case = field.snake_case || field.snake_case === void 0;
- var _combobox = uiCombobox(context, "combo-" + field.safeid).caseSensitive(field.caseSensitive).minItems(_isMulti || _isSemi ? 1 : 2);
- var _container = select_default2(null);
- var _inputWrap = select_default2(null);
- var _input = select_default2(null);
- var _comboData = [];
- var _multiData = [];
- var _entityIDs = [];
- var _tags;
- var _countryCode;
- var _staticPlaceholder;
- var _dataDeprecated = [];
- _mainFileFetcher.get("deprecated").then(function(d) {
- _dataDeprecated = d;
- }).catch(function() {
- });
- if (_isMulti && field.key && /[^:]$/.test(field.key)) {
- field.key += ":";
- }
- function snake(s) {
- return s.replace(/\s+/g, "_").toLowerCase();
- }
- function clean2(s) {
- return s.split(";").map(function(s2) {
- return s2.trim();
- }).join(";");
- }
- function tagValue(dval) {
- dval = clean2(dval || "");
- var found = _comboData.find(function(o) {
- return o.key && clean2(o.value) === dval;
+ // modules/renderer/background.js
+ var _imageryIndex = null;
+ function rendererBackground(context) {
+ const dispatch14 = dispatch_default("change");
+ const baseLayer = rendererTileLayer(context).projection(context.projection);
+ let _checkedBlocklists = [];
+ let _isValid = true;
+ let _overlayLayers = [];
+ let _brightness = 1;
+ let _contrast = 1;
+ let _saturation = 1;
+ let _sharpness = 1;
+ function ensureImageryIndex() {
+ return _mainFileFetcher.get("imagery").then((sources) => {
+ if (_imageryIndex) return _imageryIndex;
+ _imageryIndex = {
+ imagery: sources,
+ features: {}
+ };
+ const features = sources.map((source) => {
+ if (!source.polygon) return null;
+ const rings = source.polygon.map((ring) => [ring]);
+ const feature3 = {
+ type: "Feature",
+ properties: { id: source.id },
+ geometry: { type: "MultiPolygon", coordinates: rings }
+ };
+ _imageryIndex.features[source.id] = feature3;
+ return feature3;
+ }).filter(Boolean);
+ _imageryIndex.query = (0, import_which_polygon3.default)({ type: "FeatureCollection", features });
+ _imageryIndex.backgrounds = sources.map((source) => {
+ if (source.type === "bing") {
+ return rendererBackgroundSource.Bing(source, dispatch14);
+ } else if (/^EsriWorldImagery/.test(source.id)) {
+ return rendererBackgroundSource.Esri(source);
+ } else {
+ return rendererBackgroundSource(source);
+ }
+ });
+ _imageryIndex.backgrounds.unshift(rendererBackgroundSource.None());
+ let template = corePreferences("background-custom-template") || "";
+ const custom = rendererBackgroundSource.Custom(template);
+ _imageryIndex.backgrounds.unshift(custom);
+ return _imageryIndex;
});
- if (found)
- return found.key;
- if (field.type === "typeCombo" && !dval) {
- return "yes";
- }
- return (_snake_case ? snake(dval) : dval) || void 0;
}
- function displayValue(tval) {
- tval = tval || "";
- if (field.hasTextForStringId("options." + tval)) {
- return field.t("options." + tval, { default: tval });
+ function background(selection2) {
+ const currSource = baseLayer.source();
+ if (context.map().zoom() > 18) {
+ if (currSource && /^EsriWorldImagery/.test(currSource.id)) {
+ const center = context.map().center();
+ currSource.fetchTilemap(center);
+ }
}
- if (field.type === "typeCombo" && tval.toLowerCase() === "yes") {
- return "";
+ const sources = background.sources(context.map().extent());
+ const wasValid = _isValid;
+ _isValid = !!sources.filter((d2) => d2 === currSource).length;
+ if (wasValid !== _isValid) {
+ background.updateImagery();
}
- return tval;
- }
- function objectDifference(a, b) {
- return a.filter(function(d1) {
- return !b.some(function(d2) {
- return !d2.isMixed && d1.value === d2.value;
- });
- });
+ let baseFilter = "";
+ if (_brightness !== 1) {
+ baseFilter += " brightness(".concat(_brightness, ")");
+ }
+ if (_contrast !== 1) {
+ baseFilter += " contrast(".concat(_contrast, ")");
+ }
+ if (_saturation !== 1) {
+ baseFilter += " saturate(".concat(_saturation, ")");
+ }
+ if (_sharpness < 1) {
+ const blur = number_default(0.5, 5)(1 - _sharpness);
+ baseFilter += " blur(".concat(blur, "px)");
+ }
+ let base = selection2.selectAll(".layer-background").data([0]);
+ base = base.enter().insert("div", ".layer-data").attr("class", "layer layer-background").merge(base);
+ base.style("filter", baseFilter || null);
+ let imagery = base.selectAll(".layer-imagery").data([0]);
+ imagery.enter().append("div").attr("class", "layer layer-imagery").merge(imagery).call(baseLayer);
+ let maskFilter = "";
+ let mixBlendMode = "";
+ if (_sharpness > 1) {
+ mixBlendMode = "overlay";
+ maskFilter = "saturate(0) blur(3px) invert(1)";
+ let contrast = _sharpness - 1;
+ maskFilter += " contrast(".concat(contrast, ")");
+ let brightness = number_default(1, 0.85)(_sharpness - 1);
+ maskFilter += " brightness(".concat(brightness, ")");
+ }
+ let mask = base.selectAll(".layer-unsharp-mask").data(_sharpness > 1 ? [0] : []);
+ mask.exit().remove();
+ mask.enter().append("div").attr("class", "layer layer-mask layer-unsharp-mask").merge(mask).call(baseLayer).style("filter", maskFilter || null).style("mix-blend-mode", mixBlendMode || null);
+ let overlays = selection2.selectAll(".layer-overlay").data(_overlayLayers, (d2) => d2.source().name());
+ overlays.exit().remove();
+ overlays.enter().insert("div", ".layer-data").attr("class", "layer layer-overlay").merge(overlays).each((layer, i3, nodes) => select_default2(nodes[i3]).call(layer));
}
- function initCombo(selection2, attachTo) {
- if (!_allowCustomValues) {
- selection2.attr("readonly", "readonly");
+ background.updateImagery = function() {
+ let currSource = baseLayer.source();
+ if (context.inIntro() || !currSource) return;
+ let o2 = _overlayLayers.filter((d2) => !d2.source().isLocatorOverlay() && !d2.source().isHidden()).map((d2) => d2.source().id).join(",");
+ const meters = geoOffsetToMeters(currSource.offset());
+ const EPSILON = 0.01;
+ const x2 = +meters[0].toFixed(2);
+ const y2 = +meters[1].toFixed(2);
+ let hash2 = utilStringQs(window.location.hash);
+ let id2 = currSource.id;
+ if (id2 === "custom") {
+ id2 = "custom:".concat(currSource.template());
}
- if (_showTagInfoSuggestions && services.taginfo) {
- selection2.call(_combobox.fetcher(setTaginfoValues), attachTo);
- setTaginfoValues("", setPlaceholder);
+ if (id2) {
+ hash2.background = id2;
} else {
- selection2.call(_combobox, attachTo);
- setStaticValues(setPlaceholder);
+ delete hash2.background;
}
- }
- function setStaticValues(callback) {
- if (!_optarray)
- return;
- _comboData = _optarray.map(function(v) {
- return {
- key: v,
- value: field.t("options." + v, { default: v }),
- title: v,
- display: field.t.html("options." + v, { default: v }),
- klass: field.hasTextForStringId("options." + v) ? "" : "raw-option"
- };
- });
- _combobox.data(objectDifference(_comboData, _multiData));
- if (callback)
- callback(_comboData);
- }
- function setTaginfoValues(q, callback) {
- var fn = _isMulti ? "multikeys" : "values";
- var query = (_isMulti ? field.key : "") + q;
- var hasCountryPrefix = _isNetwork && _countryCode && _countryCode.indexOf(q.toLowerCase()) === 0;
- if (hasCountryPrefix) {
- query = _countryCode + ":";
+ if (o2) {
+ hash2.overlays = o2;
+ } else {
+ delete hash2.overlays;
}
- var params = {
- debounce: q !== "",
- key: field.key,
- query
+ if (Math.abs(x2) > EPSILON || Math.abs(y2) > EPSILON) {
+ hash2.offset = "".concat(x2, ",").concat(y2);
+ } else {
+ delete hash2.offset;
+ }
+ if (!window.mocha) {
+ window.location.replace("#" + utilQsString(hash2, true));
+ }
+ let imageryUsed = [];
+ let photoOverlaysUsed = [];
+ const currUsed = currSource.imageryUsed();
+ if (currUsed && _isValid) {
+ imageryUsed.push(currUsed);
+ }
+ _overlayLayers.filter((d2) => !d2.source().isLocatorOverlay() && !d2.source().isHidden()).forEach((d2) => imageryUsed.push(d2.source().imageryUsed()));
+ const dataLayer = context.layers().layer("data");
+ if (dataLayer && dataLayer.enabled() && dataLayer.hasData()) {
+ imageryUsed.push(dataLayer.getSrc());
+ }
+ const photoOverlayLayers = {
+ streetside: "Bing Streetside",
+ mapillary: "Mapillary Images",
+ "mapillary-map-features": "Mapillary Map Features",
+ "mapillary-signs": "Mapillary Signs",
+ kartaview: "KartaView Images",
+ vegbilder: "Norwegian Road Administration Images",
+ mapilio: "Mapilio Images",
+ panoramax: "Panoramax Images"
};
- if (_entityIDs.length) {
- params.geometry = context.graph().geometry(_entityIDs[0]);
+ for (let layerID in photoOverlayLayers) {
+ const layer = context.layers().layer(layerID);
+ if (layer && layer.enabled()) {
+ photoOverlaysUsed.push(layerID);
+ imageryUsed.push(photoOverlayLayers[layerID]);
+ }
}
- services.taginfo[fn](params, function(err, data) {
- if (err)
- return;
- data = data.filter(function(d) {
- if (field.type === "typeCombo" && d.value === "yes") {
- return false;
- }
- return !d.count || d.count > 10;
+ context.history().imageryUsed(imageryUsed);
+ context.history().photoOverlaysUsed(photoOverlaysUsed);
+ };
+ background.sources = (extent, zoom, includeCurrent) => {
+ if (!_imageryIndex) return [];
+ let visible = {};
+ (_imageryIndex.query.bbox(extent.rectangle(), true) || []).forEach((d2) => visible[d2.id] = true);
+ const currSource = baseLayer.source();
+ const osm = context.connection();
+ const blocklists = osm && osm.imageryBlocklists() || [];
+ const blocklistChanged = blocklists.length !== _checkedBlocklists.length || blocklists.some((regex, index) => String(regex) !== _checkedBlocklists[index]);
+ if (blocklistChanged) {
+ _imageryIndex.backgrounds.forEach((source) => {
+ source.isBlocked = blocklists.some((regex) => regex.test(source.template()));
});
- var deprecatedValues = osmEntity.deprecatedTagValuesByKey(_dataDeprecated)[field.key];
- if (deprecatedValues) {
- data = data.filter(function(d) {
- return deprecatedValues.indexOf(d.value) === -1;
- });
+ _checkedBlocklists = blocklists.map((regex) => String(regex));
+ }
+ return _imageryIndex.backgrounds.filter((source) => {
+ if (includeCurrent && currSource === source) return true;
+ if (source.isBlocked) return false;
+ if (!source.polygon) return true;
+ if (zoom && zoom < 6) return false;
+ return visible[source.id];
+ });
+ };
+ background.dimensions = (val) => {
+ if (!val) return;
+ baseLayer.dimensions(val);
+ _overlayLayers.forEach((layer) => layer.dimensions(val));
+ };
+ background.baseLayerSource = function(d2) {
+ if (!arguments.length) return baseLayer.source();
+ const osm = context.connection();
+ if (!osm) return background;
+ const blocklists = osm.imageryBlocklists();
+ const template = d2.template();
+ let fail = false;
+ let tested = 0;
+ let regex;
+ for (let i3 = 0; i3 < blocklists.length; i3++) {
+ regex = blocklists[i3];
+ fail = regex.test(template);
+ tested++;
+ if (fail) break;
+ }
+ if (!tested) {
+ regex = /.*\.google(apis)?\..*\/(vt|kh)[\?\/].*([xyz]=.*){3}.*/;
+ fail = regex.test(template);
+ }
+ baseLayer.source(!fail ? d2 : background.findSource("none"));
+ dispatch14.call("change");
+ background.updateImagery();
+ return background;
+ };
+ background.findSource = (id2) => {
+ if (!id2 || !_imageryIndex) return null;
+ return _imageryIndex.backgrounds.find((d2) => d2.id && d2.id === id2);
+ };
+ background.bing = () => {
+ background.baseLayerSource(background.findSource("Bing"));
+ };
+ background.showsLayer = (d2) => {
+ const currSource = baseLayer.source();
+ if (!d2 || !currSource) return false;
+ return d2.id === currSource.id || _overlayLayers.some((layer) => d2.id === layer.source().id);
+ };
+ background.overlayLayerSources = () => {
+ return _overlayLayers.map((layer) => layer.source());
+ };
+ background.toggleOverlayLayer = (d2) => {
+ let layer;
+ for (let i3 = 0; i3 < _overlayLayers.length; i3++) {
+ layer = _overlayLayers[i3];
+ if (layer.source() === d2) {
+ _overlayLayers.splice(i3, 1);
+ dispatch14.call("change");
+ background.updateImagery();
+ return;
}
- if (hasCountryPrefix) {
- data = data.filter(function(d) {
- return d.value.toLowerCase().indexOf(_countryCode + ":") === 0;
+ }
+ layer = rendererTileLayer(context).source(d2).projection(context.projection).dimensions(
+ baseLayer.dimensions()
+ );
+ _overlayLayers.push(layer);
+ dispatch14.call("change");
+ background.updateImagery();
+ };
+ background.nudge = (d2, zoom) => {
+ const currSource = baseLayer.source();
+ if (currSource) {
+ currSource.nudge(d2, zoom);
+ dispatch14.call("change");
+ background.updateImagery();
+ }
+ return background;
+ };
+ background.offset = function(d2) {
+ const currSource = baseLayer.source();
+ if (!arguments.length) {
+ return currSource && currSource.offset() || [0, 0];
+ }
+ if (currSource) {
+ currSource.offset(d2);
+ dispatch14.call("change");
+ background.updateImagery();
+ }
+ return background;
+ };
+ background.brightness = function(d2) {
+ if (!arguments.length) return _brightness;
+ _brightness = d2;
+ if (context.mode()) dispatch14.call("change");
+ return background;
+ };
+ background.contrast = function(d2) {
+ if (!arguments.length) return _contrast;
+ _contrast = d2;
+ if (context.mode()) dispatch14.call("change");
+ return background;
+ };
+ background.saturation = function(d2) {
+ if (!arguments.length) return _saturation;
+ _saturation = d2;
+ if (context.mode()) dispatch14.call("change");
+ return background;
+ };
+ background.sharpness = function(d2) {
+ if (!arguments.length) return _sharpness;
+ _sharpness = d2;
+ if (context.mode()) dispatch14.call("change");
+ return background;
+ };
+ let _loadPromise;
+ background.ensureLoaded = () => {
+ if (_loadPromise) return _loadPromise;
+ return _loadPromise = ensureImageryIndex();
+ };
+ background.init = () => {
+ const loadPromise = background.ensureLoaded();
+ const hash2 = utilStringQs(window.location.hash);
+ const requestedBackground = hash2.background || hash2.layer;
+ const lastUsedBackground = corePreferences("background-last-used");
+ return loadPromise.then((imageryIndex) => {
+ const extent = context.map().extent();
+ const validBackgrounds = background.sources(extent).filter((d2) => d2.id !== "none" && d2.id !== "custom");
+ const first = validBackgrounds.length && validBackgrounds[0];
+ const isLastUsedValid = !!validBackgrounds.find((d2) => d2.id && d2.id === lastUsedBackground);
+ let best;
+ if (!requestedBackground && extent) {
+ const viewArea = extent.area();
+ best = validBackgrounds.find((s2) => {
+ if (!s2.best() || s2.overlay) return false;
+ let bbox2 = turf_bbox_default(turf_bbox_clip_default(
+ { type: "MultiPolygon", coordinates: [s2.polygon || [extent.polygon()]] },
+ extent.rectangle()
+ ));
+ let area = geoExtent(bbox2.slice(0, 2), bbox2.slice(2, 4)).area();
+ return area / viewArea > 0.5;
});
}
- _container.classed("empty-combobox", data.length === 0);
- _comboData = data.map(function(d) {
- var k = d.value;
- if (_isMulti)
- k = k.replace(field.key, "");
- var label = field.t("options." + k, { default: k });
- return {
- key: k,
- value: label,
- display: field.t.html("options." + k, { default: k }),
- title: d.title || label,
- klass: field.hasTextForStringId("options." + k) ? "" : "raw-option"
- };
+ if (requestedBackground && requestedBackground.indexOf("custom:") === 0) {
+ const template = requestedBackground.replace(/^custom:/, "");
+ const custom = background.findSource("custom");
+ background.baseLayerSource(custom.template(template));
+ corePreferences("background-custom-template", template);
+ } else {
+ background.baseLayerSource(
+ background.findSource(requestedBackground) || best || isLastUsedValid && background.findSource(lastUsedBackground) || background.findSource("Bing") || first || background.findSource("none")
+ );
+ }
+ const locator = imageryIndex.backgrounds.find((d2) => d2.overlay && d2.default);
+ if (locator) {
+ background.toggleOverlayLayer(locator);
+ }
+ const overlays = (hash2.overlays || "").split(",");
+ overlays.forEach((overlay) => {
+ overlay = background.findSource(overlay);
+ if (overlay) {
+ background.toggleOverlayLayer(overlay);
+ }
});
- _comboData = objectDifference(_comboData, _multiData);
- if (callback)
- callback(_comboData);
+ if (hash2.gpx) {
+ const gpx2 = context.layers().layer("data");
+ if (gpx2) {
+ gpx2.url(hash2.gpx, ".gpx");
+ }
+ }
+ if (hash2.offset) {
+ const offset = hash2.offset.replace(/;/g, ",").split(",").map((n3) => !isNaN(n3) && n3);
+ if (offset.length === 2) {
+ background.offset(geoMetersToOffset(offset));
+ }
+ }
+ }).catch((err) => {
+ console.error(err);
});
+ };
+ return utilRebind(background, dispatch14, "on");
+ }
+
+ // modules/renderer/features.js
+ function rendererFeatures(context) {
+ var dispatch14 = dispatch_default("change", "redraw");
+ var features = utilRebind({}, dispatch14, "on");
+ var _deferred2 = /* @__PURE__ */ new Set();
+ var traffic_roads = {
+ "motorway": true,
+ "motorway_link": true,
+ "trunk": true,
+ "trunk_link": true,
+ "primary": true,
+ "primary_link": true,
+ "secondary": true,
+ "secondary_link": true,
+ "tertiary": true,
+ "tertiary_link": true,
+ "residential": true,
+ "unclassified": true,
+ "living_street": true,
+ "busway": true
+ };
+ var service_roads = {
+ "service": true,
+ "road": true,
+ "track": true
+ };
+ var paths = {
+ "path": true,
+ "footway": true,
+ "cycleway": true,
+ "bridleway": true,
+ "steps": true,
+ "ladder": true,
+ "pedestrian": true
+ };
+ var _cullFactor = 1;
+ var _cache5 = {};
+ var _rules = {};
+ var _stats = {};
+ var _keys = [];
+ var _hidden = [];
+ var _forceVisible = {};
+ function update() {
+ if (!window.mocha) {
+ var hash2 = utilStringQs(window.location.hash);
+ var disabled = features.disabled();
+ if (disabled.length) {
+ hash2.disable_features = disabled.join(",");
+ } else {
+ delete hash2.disable_features;
+ }
+ window.location.replace("#" + utilQsString(hash2, true));
+ corePreferences("disabled-features", disabled.join(","));
+ }
+ _hidden = features.hidden();
+ dispatch14.call("change");
+ dispatch14.call("redraw");
}
- function setPlaceholder(values) {
- if (_isMulti || _isSemi) {
- _staticPlaceholder = field.placeholder() || _t("inspector.add");
- } else {
- var vals = values.map(function(d) {
- return d.value;
- }).filter(function(s) {
- return s.length < 20;
+ function defineRule(k2, filter2, max3) {
+ var isEnabled = true;
+ _keys.push(k2);
+ _rules[k2] = {
+ filter: filter2,
+ enabled: isEnabled,
+ // whether the user wants it enabled..
+ count: 0,
+ currentMax: max3 || Infinity,
+ defaultMax: max3 || Infinity,
+ enable: function() {
+ this.enabled = true;
+ this.currentMax = this.defaultMax;
+ },
+ disable: function() {
+ this.enabled = false;
+ this.currentMax = 0;
+ },
+ hidden: function() {
+ return this.count === 0 && !this.enabled || this.count > this.currentMax * _cullFactor;
+ },
+ autoHidden: function() {
+ return this.hidden() && this.currentMax > 0;
+ }
+ };
+ }
+ defineRule("points", function isPoint(tags, geometry) {
+ return geometry === "point";
+ }, 200);
+ defineRule("traffic_roads", function isTrafficRoad(tags) {
+ return traffic_roads[tags.highway];
+ });
+ defineRule("service_roads", function isServiceRoad(tags) {
+ return service_roads[tags.highway];
+ });
+ defineRule("paths", function isPath(tags) {
+ return paths[tags.highway];
+ });
+ defineRule("buildings", function isBuilding(tags) {
+ return !!tags.building && tags.building !== "no" || tags.parking === "multi-storey" || tags.parking === "sheds" || tags.parking === "carports" || tags.parking === "garage_boxes";
+ }, 250);
+ defineRule("building_parts", function isBuildingPart(tags) {
+ return !!tags["building:part"];
+ });
+ defineRule("indoor", function isIndoor(tags) {
+ return !!tags.indoor;
+ });
+ defineRule("landuse", function isLanduse(tags, geometry) {
+ return geometry === "area" && (!!tags.landuse || !!tags.natural || !!tags.leisure || !!tags.amenity) && !_rules.buildings.filter(tags) && !_rules.building_parts.filter(tags) && !_rules.indoor.filter(tags) && !_rules.water.filter(tags) && !_rules.pistes.filter(tags);
+ });
+ defineRule("boundaries", function isBoundary(tags, geometry) {
+ return (geometry === "line" && !!tags.boundary || geometry === "relation" && tags.type === "boundary") && !(traffic_roads[tags.highway] || service_roads[tags.highway] || paths[tags.highway] || tags.waterway || tags.railway || tags.landuse || tags.natural || tags.building || tags.power);
+ });
+ defineRule("water", function isWater(tags) {
+ return !!tags.waterway || tags.natural === "water" || tags.natural === "coastline" || tags.natural === "bay" || tags.landuse === "pond" || tags.landuse === "basin" || tags.landuse === "reservoir" || tags.landuse === "salt_pond";
+ });
+ defineRule("rail", function isRail(tags) {
+ return (!!tags.railway || tags.landuse === "railway") && !(traffic_roads[tags.highway] || service_roads[tags.highway] || paths[tags.highway]);
+ });
+ defineRule("pistes", function isPiste(tags) {
+ return tags["piste:type"];
+ });
+ defineRule("aerialways", function isAerialways(tags) {
+ return !!(tags == null ? void 0 : tags.aerialway) && tags.aerialway !== "yes" && tags.aerialway !== "station";
+ });
+ defineRule("power", function isPower(tags) {
+ return !!tags.power;
+ });
+ defineRule("past_future", function isPastFuture(tags) {
+ if (traffic_roads[tags.highway] || service_roads[tags.highway] || paths[tags.highway]) {
+ return false;
+ }
+ const keys2 = Object.keys(tags);
+ for (let i3 = 0; i3 < keys2.length; i3++) {
+ const key = keys2[i3];
+ const s2 = key.split(":")[0];
+ if (osmLifecyclePrefixes[s2] || osmLifecyclePrefixes[tags[key]]) return true;
+ }
+ return false;
+ });
+ defineRule("others", function isOther(tags, geometry) {
+ return geometry === "line" || geometry === "area";
+ });
+ features.features = function() {
+ return _rules;
+ };
+ features.keys = function() {
+ return _keys;
+ };
+ features.enabled = function(k2) {
+ if (!arguments.length) {
+ return _keys.filter(function(k3) {
+ return _rules[k3].enabled;
+ });
+ }
+ return _rules[k2] && _rules[k2].enabled;
+ };
+ features.disabled = function(k2) {
+ if (!arguments.length) {
+ return _keys.filter(function(k3) {
+ return !_rules[k3].enabled;
+ });
+ }
+ return _rules[k2] && !_rules[k2].enabled;
+ };
+ features.hidden = function(k2) {
+ var _a4;
+ if (!arguments.length) {
+ return _keys.filter(function(k3) {
+ return _rules[k3].hidden();
});
- var placeholders = vals.length > 1 ? vals : values.map(function(d) {
- return d.key;
+ }
+ return (_a4 = _rules[k2]) == null ? void 0 : _a4.hidden();
+ };
+ features.autoHidden = function(k2) {
+ if (!arguments.length) {
+ return _keys.filter(function(k3) {
+ return _rules[k3].autoHidden();
});
- _staticPlaceholder = field.placeholder() || placeholders.slice(0, 3).join(", ");
- }
- if (!/(â¦|\.\.\.)$/.test(_staticPlaceholder)) {
- _staticPlaceholder += "\u2026";
}
- var ph;
- if (!_isMulti && !_isSemi && _tags && Array.isArray(_tags[field.key])) {
- ph = _t("inspector.multiple_values");
- } else {
- ph = _staticPlaceholder;
+ return _rules[k2] && _rules[k2].autoHidden();
+ };
+ features.enable = function(k2) {
+ if (_rules[k2] && !_rules[k2].enabled) {
+ _rules[k2].enable();
+ update();
}
- _container.selectAll("input").attr("placeholder", ph);
- }
- function change() {
- var t = {};
- var val;
- if (_isMulti || _isSemi) {
- val = tagValue(utilGetSetValue(_input).replace(/,/g, ";")) || "";
- _container.classed("active", false);
- utilGetSetValue(_input, "");
- var vals = val.split(";").filter(Boolean);
- if (!vals.length)
- return;
- if (_isMulti) {
- utilArrayUniq(vals).forEach(function(v) {
- var key = (field.key || "") + v;
- if (_tags) {
- var old = _tags[key];
- if (typeof old === "string" && old.toLowerCase() !== "no")
- return;
- }
- key = context.cleanTagKey(key);
- field.keys.push(key);
- t[key] = "yes";
- });
- } else if (_isSemi) {
- var arr = _multiData.map(function(d) {
- return d.key;
- });
- arr = arr.concat(vals);
- t[field.key] = context.cleanTagValue(utilArrayUniq(arr).filter(Boolean).join(";"));
+ };
+ features.enableAll = function() {
+ var didEnable = false;
+ for (var k2 in _rules) {
+ if (!_rules[k2].enabled) {
+ didEnable = true;
+ _rules[k2].enable();
}
- window.setTimeout(function() {
- _input.node().focus();
- }, 10);
- } else {
- var rawValue = utilGetSetValue(_input);
- if (!rawValue && Array.isArray(_tags[field.key]))
- return;
- val = context.cleanTagValue(tagValue(rawValue));
- t[field.key] = val || void 0;
}
- dispatch10.call("change", this, t);
- }
- function removeMultikey(d3_event, d) {
- d3_event.preventDefault();
- d3_event.stopPropagation();
- var t = {};
- if (_isMulti) {
- t[d.key] = void 0;
- } else if (_isSemi) {
- var arr = _multiData.map(function(md) {
- return md.key === d.key ? null : md.key;
- }).filter(Boolean);
- arr = utilArrayUniq(arr);
- t[field.key] = arr.length ? arr.join(";") : void 0;
+ if (didEnable) update();
+ };
+ features.disable = function(k2) {
+ if (_rules[k2] && _rules[k2].enabled) {
+ _rules[k2].disable();
+ update();
}
- dispatch10.call("change", this, t);
- }
- function combo(selection2) {
- _container = selection2.selectAll(".form-field-input-wrap").data([0]);
- var type3 = _isMulti || _isSemi ? "multicombo" : "combo";
- _container = _container.enter().append("div").attr("class", "form-field-input-wrap form-field-input-" + type3).merge(_container);
- if (_isMulti || _isSemi) {
- _container = _container.selectAll(".chiplist").data([0]);
- var listClass = "chiplist";
- if (field.key === "destination" || field.key === "via") {
- listClass += " full-line-chips";
+ };
+ features.disableAll = function() {
+ var didDisable = false;
+ for (var k2 in _rules) {
+ if (_rules[k2].enabled) {
+ didDisable = true;
+ _rules[k2].disable();
}
- _container = _container.enter().append("ul").attr("class", listClass).on("click", function() {
- window.setTimeout(function() {
- _input.node().focus();
- }, 10);
- }).merge(_container);
- _inputWrap = _container.selectAll(".input-wrap").data([0]);
- _inputWrap = _inputWrap.enter().append("li").attr("class", "input-wrap").merge(_inputWrap);
- _input = _inputWrap.selectAll("input").data([0]);
- } else {
- _input = _container.selectAll("input").data([0]);
}
- _input = _input.enter().append("input").attr("type", "text").attr("id", field.domId).call(utilNoAuto).call(initCombo, selection2).merge(_input);
- if (_isNetwork) {
- var extent = combinedEntityExtent();
- var countryCode = extent && iso1A2Code(extent.center());
- _countryCode = countryCode && countryCode.toLowerCase();
+ if (didDisable) update();
+ };
+ features.toggle = function(k2) {
+ if (_rules[k2]) {
+ (function(f2) {
+ return f2.enabled ? f2.disable() : f2.enable();
+ })(_rules[k2]);
+ update();
}
- _input.on("change", change).on("blur", change);
- _input.on("keydown.field", function(d3_event) {
- switch (d3_event.keyCode) {
- case 13:
- _input.node().blur();
- d3_event.stopPropagation();
- break;
+ };
+ features.resetStats = function() {
+ for (var i3 = 0; i3 < _keys.length; i3++) {
+ _rules[_keys[i3]].count = 0;
+ }
+ dispatch14.call("change");
+ };
+ features.gatherStats = function(d2, resolver, dimensions) {
+ var needsRedraw = false;
+ var types = utilArrayGroupBy(d2, "type");
+ var entities = [].concat(types.relation || [], types.way || [], types.node || []);
+ var currHidden, geometry, matches, i3, j2;
+ for (i3 = 0; i3 < _keys.length; i3++) {
+ _rules[_keys[i3]].count = 0;
+ }
+ _cullFactor = dimensions[0] * dimensions[1] / 1e6;
+ for (i3 = 0; i3 < entities.length; i3++) {
+ geometry = entities[i3].geometry(resolver);
+ matches = Object.keys(features.getMatches(entities[i3], resolver, geometry));
+ for (j2 = 0; j2 < matches.length; j2++) {
+ _rules[matches[j2]].count++;
}
- });
- if (_isMulti || _isSemi) {
- _combobox.on("accept", function() {
- _input.node().blur();
- _input.node().focus();
- });
- _input.on("focus", function() {
- _container.classed("active", true);
- });
}
+ currHidden = features.hidden();
+ if (currHidden !== _hidden) {
+ _hidden = currHidden;
+ needsRedraw = true;
+ dispatch14.call("change");
+ }
+ return needsRedraw;
+ };
+ features.stats = function() {
+ for (var i3 = 0; i3 < _keys.length; i3++) {
+ _stats[_keys[i3]] = _rules[_keys[i3]].count;
+ }
+ return _stats;
+ };
+ features.clear = function(d2) {
+ for (var i3 = 0; i3 < d2.length; i3++) {
+ features.clearEntity(d2[i3]);
+ }
+ };
+ features.clearEntity = function(entity) {
+ delete _cache5[osmEntity.key(entity)];
+ };
+ features.reset = function() {
+ Array.from(_deferred2).forEach(function(handle) {
+ window.cancelIdleCallback(handle);
+ _deferred2.delete(handle);
+ });
+ _cache5 = {};
+ };
+ function relationShouldBeChecked(relation) {
+ return relation.tags.type === "boundary";
}
- combo.tags = function(tags) {
- _tags = tags;
- if (_isMulti || _isSemi) {
- _multiData = [];
- var maxLength;
- if (_isMulti) {
- for (var k in tags) {
- if (field.key && k.indexOf(field.key) !== 0)
- continue;
- if (!field.key && field.keys.indexOf(k) === -1)
- continue;
- var v = tags[k];
- if (!v || typeof v === "string" && v.toLowerCase() === "no")
- continue;
- var suffix = field.key ? k.substr(field.key.length) : k;
- _multiData.push({
- key: k,
- value: displayValue(suffix),
- isMixed: Array.isArray(v)
- });
- }
- if (field.key) {
- field.keys = _multiData.map(function(d) {
- return d.key;
- });
- maxLength = context.maxCharsForTagKey() - utilUnicodeCharsCount(field.key);
- } else {
- maxLength = context.maxCharsForTagKey();
- }
- } else if (_isSemi) {
- var allValues = [];
- var commonValues;
- if (Array.isArray(tags[field.key])) {
- tags[field.key].forEach(function(tagVal) {
- var thisVals = utilArrayUniq((tagVal || "").split(";")).filter(Boolean);
- allValues = allValues.concat(thisVals);
- if (!commonValues) {
- commonValues = thisVals;
- } else {
- commonValues = commonValues.filter((value) => thisVals.includes(value));
+ features.getMatches = function(entity, resolver, geometry) {
+ if (geometry === "vertex" || geometry === "relation" && !relationShouldBeChecked(entity)) return {};
+ var ent = osmEntity.key(entity);
+ if (!_cache5[ent]) {
+ _cache5[ent] = {};
+ }
+ if (!_cache5[ent].matches) {
+ var matches = {};
+ var hasMatch = false;
+ for (var i3 = 0; i3 < _keys.length; i3++) {
+ if (_keys[i3] === "others") {
+ if (hasMatch) continue;
+ if (entity.type === "way") {
+ var parents = features.getParents(entity, resolver, geometry);
+ if (parents.length === 1 && parents[0].isMultipolygon() || // 2b. or belongs only to boundary relations
+ parents.length > 0 && parents.every(function(parent) {
+ return parent.tags.type === "boundary";
+ })) {
+ var pkey = osmEntity.key(parents[0]);
+ if (_cache5[pkey] && _cache5[pkey].matches) {
+ matches = Object.assign({}, _cache5[pkey].matches);
+ continue;
+ }
}
- });
- allValues = utilArrayUniq(allValues).filter(Boolean);
- } else {
- allValues = utilArrayUniq((tags[field.key] || "").split(";")).filter(Boolean);
- commonValues = allValues;
+ }
}
- _multiData = allValues.map(function(v2) {
- return {
- key: v2,
- value: displayValue(v2),
- isMixed: !commonValues.includes(v2)
- };
- });
- var currLength = utilUnicodeCharsCount(commonValues.join(";"));
- maxLength = context.maxCharsForTagValue() - currLength;
- if (currLength > 0) {
- maxLength -= 1;
+ if (_rules[_keys[i3]].filter(entity.tags, geometry)) {
+ matches[_keys[i3]] = hasMatch = true;
}
}
- maxLength = Math.max(0, maxLength);
- var allowDragAndDrop = _isSemi && !Array.isArray(tags[field.key]);
- var available = objectDifference(_comboData, _multiData);
- _combobox.data(available);
- var hideAdd = !_allowCustomValues && !available.length || maxLength <= 0;
- _container.selectAll(".chiplist .input-wrap").style("display", hideAdd ? "none" : null);
- var chips = _container.selectAll(".chip").data(_multiData);
- chips.exit().remove();
- var enter = chips.enter().insert("li", ".input-wrap").attr("class", "chip");
- enter.append("span");
- enter.append("a");
- chips = chips.merge(enter).order().classed("raw-value", function(d) {
- var k2 = d.key;
- if (_isMulti)
- k2 = k2.replace(field.key, "");
- return !field.hasTextForStringId("options." + k2);
- }).classed("draggable", allowDragAndDrop).classed("mixed", function(d) {
- return d.isMixed;
- }).attr("title", function(d) {
- return d.isMixed ? _t("inspector.unshared_value_tooltip") : null;
- });
- if (allowDragAndDrop) {
- registerDragAndDrop(chips);
- }
- chips.select("span").text(function(d) {
- return d.value;
- });
- chips.select("a").attr("href", "#").on("click", removeMultikey).attr("class", "remove").text("\xD7");
- } else {
- var isMixed = Array.isArray(tags[field.key]);
- var mixedValues = isMixed && tags[field.key].map(function(val) {
- return displayValue(val);
- }).filter(Boolean);
- var showsValue = !isMixed && tags[field.key] && !(field.type === "typeCombo" && tags[field.key] === "yes");
- var isRawValue = showsValue && !field.hasTextForStringId("options." + tags[field.key]);
- var isKnownValue = showsValue && !isRawValue;
- var isReadOnly = !_allowCustomValues || isKnownValue;
- utilGetSetValue(_input, !isMixed ? displayValue(tags[field.key]) : "").classed("raw-value", isRawValue).classed("known-value", isKnownValue).attr("readonly", isReadOnly ? "readonly" : void 0).attr("title", isMixed ? mixedValues.join("\n") : void 0).attr("placeholder", isMixed ? _t("inspector.multiple_values") : _staticPlaceholder || "").classed("mixed", isMixed).on("keydown.deleteCapture", function(d3_event) {
- if (isReadOnly && isKnownValue && (d3_event.keyCode === utilKeybinding.keyCodes["\u232B"] || d3_event.keyCode === utilKeybinding.keyCodes["\u2326"])) {
- d3_event.preventDefault();
- d3_event.stopPropagation();
- var t = {};
- t[field.key] = void 0;
- dispatch10.call("change", this, t);
- }
- });
+ _cache5[ent].matches = matches;
}
+ return _cache5[ent].matches;
};
- function registerDragAndDrop(selection2) {
- var dragOrigin, targetIndex;
- selection2.call(drag_default().on("start", function(d3_event) {
- dragOrigin = {
- x: d3_event.x,
- y: d3_event.y
- };
- targetIndex = null;
- }).on("drag", function(d3_event) {
- var x = d3_event.x - dragOrigin.x, y = d3_event.y - dragOrigin.y;
- if (!select_default2(this).classed("dragging") && Math.sqrt(Math.pow(x, 2) + Math.pow(y, 2)) <= 5)
- return;
- var index = selection2.nodes().indexOf(this);
- select_default2(this).classed("dragging", true);
- targetIndex = null;
- var targetIndexOffsetTop = null;
- var draggedTagWidth = select_default2(this).node().offsetWidth;
- if (field.key === "destination" || field.key === "via") {
- _container.selectAll(".chip").style("transform", function(d2, index2) {
- var node = select_default2(this).node();
- if (index === index2) {
- return "translate(" + x + "px, " + y + "px)";
- } else if (index2 > index && d3_event.y > node.offsetTop) {
- if (targetIndex === null || index2 > targetIndex) {
- targetIndex = index2;
- }
- return "translateY(-100%)";
- } else if (index2 < index && d3_event.y < node.offsetTop + node.offsetHeight) {
- if (targetIndex === null || index2 < targetIndex) {
- targetIndex = index2;
- }
- return "translateY(100%)";
- }
- return null;
- });
+ features.getParents = function(entity, resolver, geometry) {
+ if (geometry === "point") return [];
+ var ent = osmEntity.key(entity);
+ if (!_cache5[ent]) {
+ _cache5[ent] = {};
+ }
+ if (!_cache5[ent].parents) {
+ var parents = [];
+ if (geometry === "vertex") {
+ parents = resolver.parentWays(entity);
} else {
- _container.selectAll(".chip").each(function(d2, index2) {
- var node = select_default2(this).node();
- if (index !== index2 && d3_event.x < node.offsetLeft + node.offsetWidth + 5 && d3_event.x > node.offsetLeft && d3_event.y < node.offsetTop + node.offsetHeight && d3_event.y > node.offsetTop) {
- targetIndex = index2;
- targetIndexOffsetTop = node.offsetTop;
- }
- }).style("transform", function(d2, index2) {
- var node = select_default2(this).node();
- if (index === index2) {
- return "translate(" + x + "px, " + y + "px)";
- }
- if (node.offsetTop === targetIndexOffsetTop) {
- if (index2 < index && index2 >= targetIndex) {
- return "translateX(" + draggedTagWidth + "px)";
- } else if (index2 > index && index2 <= targetIndex) {
- return "translateX(-" + draggedTagWidth + "px)";
- }
- }
- return null;
- });
- }
- }).on("end", function() {
- if (!select_default2(this).classed("dragging")) {
- return;
+ parents = resolver.parentRelations(entity);
}
- var index = selection2.nodes().indexOf(this);
- select_default2(this).classed("dragging", false);
- _container.selectAll(".chip").style("transform", null);
- if (typeof targetIndex === "number") {
- var element = _multiData[index];
- _multiData.splice(index, 1);
- _multiData.splice(targetIndex, 0, element);
- var t = {};
- if (_multiData.length) {
- t[field.key] = _multiData.map(function(element2) {
- return element2.key;
- }).join(";");
- } else {
- t[field.key] = void 0;
+ _cache5[ent].parents = parents;
+ }
+ return _cache5[ent].parents;
+ };
+ features.isHiddenPreset = function(preset, geometry) {
+ if (!_hidden.length) return false;
+ if (!preset.tags) return false;
+ var test = preset.setTags({}, geometry);
+ for (var key in _rules) {
+ if (_rules[key].filter(test, geometry)) {
+ if (_hidden.indexOf(key) !== -1) {
+ return key;
}
- dispatch10.call("change", this, t);
+ return false;
}
- dragOrigin = void 0;
- targetIndex = void 0;
- }));
- }
- combo.focus = function() {
- _input.node().focus();
- };
- combo.entityIDs = function(val) {
- if (!arguments.length)
- return _entityIDs;
- _entityIDs = val;
- return combo;
+ }
+ return false;
};
- function combinedEntityExtent() {
- return _entityIDs && _entityIDs.length && utilTotalExtent(_entityIDs, context.graph());
- }
- return utilRebind(combo, dispatch10, "on");
- }
-
- // modules/ui/fields/input.js
- function uiFieldText(field, context) {
- var dispatch10 = dispatch_default("change");
- var input = select_default2(null);
- var outlinkButton = select_default2(null);
- var wrap2 = select_default2(null);
- var _entityIDs = [];
- var _tags;
- var _phoneFormats = {};
- if (field.type === "tel") {
- _mainFileFetcher.get("phone_formats").then(function(d) {
- _phoneFormats = d;
- updatePhonePlaceholder();
- }).catch(function() {
- });
- }
- function calcLocked() {
- var isLocked = (field.id === "brand" || field.id === "network" || field.id === "operator" || field.id === "flag") && _entityIDs.length && _entityIDs.some(function(entityID) {
- var entity = context.graph().hasEntity(entityID);
- if (!entity)
+ features.isHiddenFeature = function(entity, resolver, geometry) {
+ if (!_hidden.length) return false;
+ if (!entity.version) return false;
+ if (_forceVisible[entity.id]) return false;
+ var matches = Object.keys(features.getMatches(entity, resolver, geometry));
+ return matches.length && matches.every(function(k2) {
+ return features.hidden(k2);
+ });
+ };
+ features.isHiddenChild = function(entity, resolver, geometry) {
+ if (!_hidden.length) return false;
+ if (!entity.version || geometry === "point") return false;
+ if (_forceVisible[entity.id]) return false;
+ var parents = features.getParents(entity, resolver, geometry);
+ if (!parents.length) return false;
+ for (var i3 = 0; i3 < parents.length; i3++) {
+ if (!features.isHidden(parents[i3], resolver, parents[i3].geometry(resolver))) {
return false;
- if (entity.tags.wikidata)
- return true;
- var preset = _mainPresetIndex.match(entity, context.graph());
- var isSuggestion = preset && preset.suggestion;
- var which = field.id;
- return isSuggestion && !!entity.tags[which] && !!entity.tags[which + ":wikidata"];
- });
- field.locked(isLocked);
- }
- function i2(selection2) {
- calcLocked();
- var isLocked = field.locked();
- wrap2 = selection2.selectAll(".form-field-input-wrap").data([0]);
- wrap2 = wrap2.enter().append("div").attr("class", "form-field-input-wrap form-field-input-" + field.type).merge(wrap2);
- input = wrap2.selectAll("input").data([0]);
- input = input.enter().append("input").attr("type", field.type === "identifier" ? "text" : field.type).attr("id", field.domId).classed(field.type, true).call(utilNoAuto).merge(input);
- input.classed("disabled", !!isLocked).attr("readonly", isLocked || null).on("input", change(true)).on("blur", change()).on("change", change());
- if (field.type === "tel") {
- updatePhonePlaceholder();
- } else if (field.type === "number") {
- var rtl = _mainLocalizer.textDirection() === "rtl";
- input.attr("type", "text");
- var inc = field.increment;
- var buttons = wrap2.selectAll(".increment, .decrement").data(rtl ? [inc, -inc] : [-inc, inc]);
- buttons.enter().append("button").attr("class", function(d) {
- var which = d > 0 ? "increment" : "decrement";
- return "form-field-button " + which;
- }).attr("title", function(d) {
- var which = d > 0 ? "increment" : "decrement";
- return _t(`inspector.${which}`);
- }).merge(buttons).on("click", function(d3_event, d) {
- d3_event.preventDefault();
- var raw_vals = input.node().value || "0";
- var vals = raw_vals.split(";");
- vals = vals.map(function(v) {
- var num = parseFloat(v.trim(), 10);
- return isFinite(num) ? clamped(num + d) : v.trim();
- });
- input.node().value = vals.join(";");
- change()();
- });
- } else if (field.type === "identifier" && field.urlFormat && field.pattern) {
- input.attr("type", "text");
- outlinkButton = wrap2.selectAll(".foreign-id-permalink").data([0]);
- outlinkButton.enter().append("button").call(svgIcon("#iD-icon-out-link")).attr("class", "form-field-button foreign-id-permalink").attr("title", function() {
- var domainResults = /^https?:\/\/(.{1,}?)\//.exec(field.urlFormat);
- if (domainResults.length >= 2 && domainResults[1]) {
- var domain2 = domainResults[1];
- return _t("icons.view_on", { domain: domain2 });
- }
- return "";
- }).on("click", function(d3_event) {
- d3_event.preventDefault();
- var value = validIdentifierValueForLink();
- if (value) {
- var url = field.urlFormat.replace(/{value}/, encodeURIComponent(value));
- window.open(url, "_blank");
- }
- }).merge(outlinkButton);
- } else if (field.type === "url") {
- input.attr("type", "text");
- outlinkButton = wrap2.selectAll(".foreign-id-permalink").data([0]);
- outlinkButton.enter().append("button").call(svgIcon("#iD-icon-out-link")).attr("class", "form-field-button foreign-id-permalink").attr("title", () => _t("icons.visit_website")).on("click", function(d3_event) {
- d3_event.preventDefault();
- const value = validIdentifierValueForLink();
- if (value)
- window.open(value, "_blank");
- }).merge(outlinkButton);
- } else if (field.key.split(":").includes("colour")) {
- input.attr("type", "text");
- updateColourPreview();
- }
- }
- function isColourValid(colour) {
- if (!colour.match(/^(#([0-9a-fA-F]{3}){1,2}|\w+)$/)) {
- return false;
- } else if (!CSS.supports("color", colour) || ["unset", "inherit", "initial", "revert"].includes(colour)) {
- return false;
+ }
}
return true;
- }
- function updateColourPreview() {
- wrap2.selectAll(".colour-preview").remove();
- const colour = utilGetSetValue(input);
- if (!isColourValid(colour) && colour !== "")
- return;
- var colourSelector = wrap2.selectAll(".colour-selector").data([0]);
- outlinkButton = wrap2.selectAll(".colour-preview").data([colour]);
- colourSelector.enter().append("input").attr("type", "color").attr("class", "form-field-button colour-selector").attr("value", colour).on("input", debounce_default(function(d3_event) {
- d3_event.preventDefault();
- var colour2 = this.value;
- if (!isColourValid(colour2))
- return;
- utilGetSetValue(input, this.value);
- change()();
- updateColourPreview();
- }, 100));
- outlinkButton = outlinkButton.enter().append("div").attr("class", "form-field-button colour-preview").append("div").style("background-color", (d) => d).attr("class", "colour-box");
- if (colour === "") {
- outlinkButton = outlinkButton.call(svgIcon("#iD-icon-edit"));
+ };
+ features.hasHiddenConnections = function(entity, resolver) {
+ if (!_hidden.length) return false;
+ var childNodes, connections;
+ if (entity.type === "midpoint") {
+ childNodes = [resolver.entity(entity.edge[0]), resolver.entity(entity.edge[1])];
+ connections = [];
+ } else {
+ childNodes = entity.nodes ? resolver.childNodes(entity) : [];
+ connections = features.getParents(entity, resolver, entity.geometry(resolver));
}
- outlinkButton.on("click", () => wrap2.select(".colour-selector").node().click()).merge(outlinkButton);
- }
- function updatePhonePlaceholder() {
- if (input.empty() || !Object.keys(_phoneFormats).length)
- return;
- var extent = combinedEntityExtent();
- var countryCode = extent && iso1A2Code(extent.center());
- var format2 = countryCode && _phoneFormats[countryCode.toLowerCase()];
- if (format2)
- input.attr("placeholder", format2);
- }
- function validIdentifierValueForLink() {
- const value = utilGetSetValue(input).trim();
- if (field.type === "url" && value) {
- try {
- return new URL(value).href;
- } catch (e) {
- return null;
+ connections = childNodes.reduce(function(result, e3) {
+ return resolver.isShared(e3) ? utilArrayUnion(result, resolver.parentWays(e3)) : result;
+ }, connections);
+ return connections.some(function(e3) {
+ return features.isHidden(e3, resolver, e3.geometry(resolver));
+ });
+ };
+ features.isHidden = function(entity, resolver, geometry) {
+ if (!_hidden.length) return false;
+ if (!entity.version) return false;
+ var fn = geometry === "vertex" ? features.isHiddenChild : features.isHiddenFeature;
+ return fn(entity, resolver, geometry);
+ };
+ features.filter = function(d2, resolver) {
+ if (!_hidden.length) return d2;
+ var result = [];
+ for (var i3 = 0; i3 < d2.length; i3++) {
+ var entity = d2[i3];
+ if (!features.isHidden(entity, resolver, entity.geometry(resolver))) {
+ result.push(entity);
}
}
- if (field.type === "identifier" && field.pattern) {
- return value && value.match(new RegExp(field.pattern))[0];
- }
- return null;
- }
- function clamped(num) {
- if (field.minValue !== void 0) {
- num = Math.max(num, field.minValue);
- }
- if (field.maxValue !== void 0) {
- num = Math.min(num, field.maxValue);
- }
- return num;
- }
- function change(onInput) {
- return function() {
- var t = {};
- var val = utilGetSetValue(input);
- if (!onInput)
- val = context.cleanTagValue(val);
- if (!val && Array.isArray(_tags[field.key]))
- return;
- if (!onInput) {
- if (field.type === "number" && val) {
- var vals = val.split(";");
- vals = vals.map(function(v) {
- var num = parseFloat(v.trim(), 10);
- return isFinite(num) ? clamped(num) : v.trim();
- });
- val = vals.join(";");
+ return result;
+ };
+ features.forceVisible = function(entityIDs) {
+ if (!arguments.length) return Object.keys(_forceVisible);
+ _forceVisible = {};
+ for (var i3 = 0; i3 < entityIDs.length; i3++) {
+ _forceVisible[entityIDs[i3]] = true;
+ var entity = context.hasEntity(entityIDs[i3]);
+ if (entity && entity.type === "relation") {
+ for (var j2 in entity.members) {
+ _forceVisible[entity.members[j2].id] = true;
}
- utilGetSetValue(input, val);
}
- t[field.key] = val || void 0;
- dispatch10.call("change", this, t, onInput);
- };
- }
- i2.entityIDs = function(val) {
- if (!arguments.length)
- return _entityIDs;
- _entityIDs = val;
- return i2;
- };
- i2.tags = function(tags) {
- _tags = tags;
- var isMixed = Array.isArray(tags[field.key]);
- utilGetSetValue(input, !isMixed && tags[field.key] ? tags[field.key] : "").attr("title", isMixed ? tags[field.key].filter(Boolean).join("\n") : void 0).attr("placeholder", isMixed ? _t("inspector.multiple_values") : field.placeholder() || _t("inspector.unknown")).classed("mixed", isMixed);
- if (field.key.split(":").includes("colour"))
- updateColourPreview();
- if (outlinkButton && !outlinkButton.empty()) {
- var disabled = !validIdentifierValueForLink();
- outlinkButton.classed("disabled", disabled);
}
+ return features;
};
- i2.focus = function() {
- var node = input.node();
- if (node)
- node.focus();
+ features.init = function() {
+ var storage = corePreferences("disabled-features");
+ if (storage) {
+ var storageDisabled = storage.replace(/;/g, ",").split(",");
+ storageDisabled.forEach(features.disable);
+ }
+ var hash2 = utilStringQs(window.location.hash);
+ if (hash2.disable_features) {
+ var hashDisabled = hash2.disable_features.replace(/;/g, ",").split(",");
+ hashDisabled.forEach(features.disable);
+ }
};
- function combinedEntityExtent() {
- return _entityIDs && _entityIDs.length && utilTotalExtent(_entityIDs, context.graph());
+ context.history().on("merge.features", function(newEntities) {
+ if (!newEntities) return;
+ var handle = window.requestIdleCallback(function() {
+ var graph = context.graph();
+ var types = utilArrayGroupBy(newEntities, "type");
+ var entities = [].concat(types.relation || [], types.way || [], types.node || []);
+ for (var i3 = 0; i3 < entities.length; i3++) {
+ var geometry = entities[i3].geometry(graph);
+ features.getMatches(entities[i3], graph, geometry);
+ }
+ });
+ _deferred2.add(handle);
+ });
+ return features;
+ }
+
+ // modules/util/bind_once.js
+ function utilBindOnce(target, type2, listener, capture) {
+ var typeOnce = type2 + ".once";
+ function one2() {
+ target.on(typeOnce, null);
+ listener.apply(this, arguments);
}
- return utilRebind(i2, dispatch10, "on");
+ target.on(typeOnce, one2, capture);
+ return this;
}
- // modules/ui/fields/access.js
- function uiFieldAccess(field, context) {
- var dispatch10 = dispatch_default("change");
- var items = select_default2(null);
- var _tags;
- function access(selection2) {
- var wrap2 = selection2.selectAll(".form-field-input-wrap").data([0]);
- wrap2 = wrap2.enter().append("div").attr("class", "form-field-input-wrap form-field-input-" + field.type).merge(wrap2);
- var list = wrap2.selectAll("ul").data([0]);
- list = list.enter().append("ul").attr("class", "rows").merge(list);
- items = list.selectAll("li").data(field.keys);
- var enter = items.enter().append("li").attr("class", function(d) {
- return "labeled-input preset-access-" + d;
- });
- enter.append("span").attr("class", "label preset-label-access").attr("for", function(d) {
- return "preset-input-access-" + d;
- }).html(function(d) {
- return field.t.html("types." + d);
- });
- enter.append("div").attr("class", "preset-input-access-wrap").append("input").attr("type", "text").attr("class", function(d) {
- return "preset-input-access preset-input-access-" + d;
- }).call(utilNoAuto).each(function(d) {
- select_default2(this).call(uiCombobox(context, "access-" + d).data(access.options(d)));
- });
- items = items.merge(enter);
- wrap2.selectAll(".preset-input-access").on("change", change).on("blur", change);
+ // modules/util/zoom_pan.js
+ function defaultFilter3(d3_event) {
+ return !d3_event.ctrlKey && !d3_event.button;
+ }
+ function defaultExtent2() {
+ var e3 = this;
+ if (e3 instanceof SVGElement) {
+ e3 = e3.ownerSVGElement || e3;
+ if (e3.hasAttribute("viewBox")) {
+ e3 = e3.viewBox.baseVal;
+ return [[e3.x, e3.y], [e3.x + e3.width, e3.y + e3.height]];
+ }
+ return [[0, 0], [e3.width.baseVal.value, e3.height.baseVal.value]];
}
- function change(d3_event, d) {
- var tag = {};
- var value = context.cleanTagValue(utilGetSetValue(select_default2(this)));
- if (!value && typeof _tags[d] !== "string")
- return;
- tag[d] = value || void 0;
- dispatch10.call("change", this, tag);
+ return [[0, 0], [e3.clientWidth, e3.clientHeight]];
+ }
+ function defaultWheelDelta2(d3_event) {
+ return -d3_event.deltaY * (d3_event.deltaMode === 1 ? 0.05 : d3_event.deltaMode ? 1 : 2e-3);
+ }
+ function defaultConstrain2(transform2, extent, translateExtent) {
+ var dx0 = transform2.invertX(extent[0][0]) - translateExtent[0][0], dx1 = transform2.invertX(extent[1][0]) - translateExtent[1][0], dy0 = transform2.invertY(extent[0][1]) - translateExtent[0][1], dy1 = transform2.invertY(extent[1][1]) - translateExtent[1][1];
+ return transform2.translate(
+ dx1 > dx0 ? (dx0 + dx1) / 2 : Math.min(0, dx0) || Math.max(0, dx1),
+ dy1 > dy0 ? (dy0 + dy1) / 2 : Math.min(0, dy0) || Math.max(0, dy1)
+ );
+ }
+ function utilZoomPan() {
+ var filter2 = defaultFilter3, extent = defaultExtent2, constrain = defaultConstrain2, wheelDelta = defaultWheelDelta2, scaleExtent = [0, Infinity], translateExtent = [[-Infinity, -Infinity], [Infinity, Infinity]], interpolate = zoom_default, dispatch14 = dispatch_default("start", "zoom", "end"), _wheelDelay = 150, _transform = identity2, _activeGesture;
+ function zoom(selection2) {
+ selection2.on("pointerdown.zoom", pointerdown).on("wheel.zoom", wheeled).style("touch-action", "none").style("-webkit-tap-highlight-color", "rgba(0,0,0,0)");
+ select_default2(window).on("pointermove.zoompan", pointermove).on("pointerup.zoompan pointercancel.zoompan", pointerup);
}
- access.options = function(type3) {
- var options2 = [
- "yes",
- "no",
- "designated",
- "permissive",
- "destination",
- "customers",
- "private",
- "permit",
- "unknown"
- ];
- if (type3 === "access") {
- options2 = options2.filter((v) => v !== "yes" && v !== "designated");
- }
- if (type3 === "bicycle") {
- options2.splice(options2.length - 4, 0, "dismount");
+ zoom.transform = function(collection, transform2, point) {
+ var selection2 = collection.selection ? collection.selection() : collection;
+ if (collection !== selection2) {
+ schedule(collection, transform2, point);
+ } else {
+ selection2.interrupt().each(function() {
+ gesture(this, arguments).start(null).zoom(null, null, typeof transform2 === "function" ? transform2.apply(this, arguments) : transform2).end(null);
+ });
}
- return options2.map(function(option) {
- return {
- title: field.t("options." + option + ".description"),
- value: option
- };
- });
};
- var placeholdersByHighway = {
- footway: {
- foot: "designated",
- motor_vehicle: "no"
- },
- steps: {
- foot: "yes",
- motor_vehicle: "no",
- bicycle: "no",
- horse: "no"
- },
- pedestrian: {
- foot: "yes",
- motor_vehicle: "no"
- },
- cycleway: {
- motor_vehicle: "no",
- bicycle: "designated"
- },
- bridleway: {
- motor_vehicle: "no",
- horse: "designated"
- },
- path: {
- foot: "yes",
- motor_vehicle: "no",
- bicycle: "yes",
- horse: "yes"
- },
- motorway: {
- foot: "no",
- motor_vehicle: "yes",
- bicycle: "no",
- horse: "no"
- },
- trunk: {
- motor_vehicle: "yes"
- },
- primary: {
- foot: "yes",
- motor_vehicle: "yes",
- bicycle: "yes",
- horse: "yes"
- },
- secondary: {
- foot: "yes",
- motor_vehicle: "yes",
- bicycle: "yes",
- horse: "yes"
- },
- tertiary: {
- foot: "yes",
- motor_vehicle: "yes",
- bicycle: "yes",
- horse: "yes"
- },
- residential: {
- foot: "yes",
- motor_vehicle: "yes",
- bicycle: "yes",
- horse: "yes"
- },
- unclassified: {
- foot: "yes",
- motor_vehicle: "yes",
- bicycle: "yes",
- horse: "yes"
- },
- service: {
- foot: "yes",
- motor_vehicle: "yes",
- bicycle: "yes",
- horse: "yes"
- },
- motorway_link: {
- foot: "no",
- motor_vehicle: "yes",
- bicycle: "no",
- horse: "no"
- },
- trunk_link: {
- motor_vehicle: "yes"
- },
- primary_link: {
- foot: "yes",
- motor_vehicle: "yes",
- bicycle: "yes",
- horse: "yes"
- },
- secondary_link: {
- foot: "yes",
- motor_vehicle: "yes",
- bicycle: "yes",
- horse: "yes"
- },
- tertiary_link: {
- foot: "yes",
- motor_vehicle: "yes",
- bicycle: "yes",
- horse: "yes"
- },
- construction: {
- access: "no"
- }
+ zoom.scaleBy = function(selection2, k2, p2) {
+ zoom.scaleTo(selection2, function() {
+ var k0 = _transform.k, k1 = typeof k2 === "function" ? k2.apply(this, arguments) : k2;
+ return k0 * k1;
+ }, p2);
+ };
+ zoom.scaleTo = function(selection2, k2, p2) {
+ zoom.transform(selection2, function() {
+ var e3 = extent.apply(this, arguments), t0 = _transform, p02 = !p2 ? centroid(e3) : typeof p2 === "function" ? p2.apply(this, arguments) : p2, p1 = t0.invert(p02), k1 = typeof k2 === "function" ? k2.apply(this, arguments) : k2;
+ return constrain(translate(scale(t0, k1), p02, p1), e3, translateExtent);
+ }, p2);
};
- access.tags = function(tags) {
- _tags = tags;
- utilGetSetValue(items.selectAll(".preset-input-access"), function(d) {
- return typeof tags[d] === "string" ? tags[d] : "";
- }).classed("mixed", function(d) {
- return tags[d] && Array.isArray(tags[d]);
- }).attr("title", function(d) {
- return tags[d] && Array.isArray(tags[d]) && tags[d].filter(Boolean).join("\n");
- }).attr("placeholder", function(d) {
- if (tags[d] && Array.isArray(tags[d])) {
- return _t("inspector.multiple_values");
- }
- if (d === "bicycle" || d === "motor_vehicle") {
- if (tags.vehicle && typeof tags.vehicle === "string") {
- return tags.vehicle;
- }
- }
- if (tags.access && typeof tags.access === "string") {
- return tags.access;
- }
- if (tags.highway) {
- if (typeof tags.highway === "string") {
- if (placeholdersByHighway[tags.highway] && placeholdersByHighway[tags.highway][d]) {
- return placeholdersByHighway[tags.highway][d];
- }
- } else {
- var impliedAccesses = tags.highway.filter(Boolean).map(function(highwayVal) {
- return placeholdersByHighway[highwayVal] && placeholdersByHighway[highwayVal][d];
- }).filter(Boolean);
- if (impliedAccesses.length === tags.highway.length && new Set(impliedAccesses).size === 1) {
- return impliedAccesses[0];
- }
- }
- }
- if (d === "access") {
- return "yes";
- }
- return field.placeholder();
+ zoom.translateBy = function(selection2, x2, y2) {
+ zoom.transform(selection2, function() {
+ return constrain(_transform.translate(
+ typeof x2 === "function" ? x2.apply(this, arguments) : x2,
+ typeof y2 === "function" ? y2.apply(this, arguments) : y2
+ ), extent.apply(this, arguments), translateExtent);
});
};
- access.focus = function() {
- items.selectAll(".preset-input-access").node().focus();
+ zoom.translateTo = function(selection2, x2, y2, p2) {
+ zoom.transform(selection2, function() {
+ var e3 = extent.apply(this, arguments), t2 = _transform, p02 = !p2 ? centroid(e3) : typeof p2 === "function" ? p2.apply(this, arguments) : p2;
+ return constrain(identity2.translate(p02[0], p02[1]).scale(t2.k).translate(
+ typeof x2 === "function" ? -x2.apply(this, arguments) : -x2,
+ typeof y2 === "function" ? -y2.apply(this, arguments) : -y2
+ ), e3, translateExtent);
+ }, p2);
};
- return utilRebind(access, dispatch10, "on");
- }
-
- // modules/ui/fields/address.js
- function uiFieldAddress(field, context) {
- var dispatch10 = dispatch_default("change");
- var _selection = select_default2(null);
- var _wrap = select_default2(null);
- var addrField = _mainPresetIndex.field("address");
- var _entityIDs = [];
- var _tags;
- var _countryCode;
- var _addressFormats = [{
- format: [
- ["housenumber", "street"],
- ["city", "postcode"]
- ]
- }];
- _mainFileFetcher.get("address_formats").then(function(d) {
- _addressFormats = d;
- if (!_selection.empty()) {
- _selection.call(address);
- }
- }).catch(function() {
- });
- function getNearStreets() {
- var extent = combinedEntityExtent();
- var l = extent.center();
- var box = geoExtent(l).padByMeters(200);
- var streets = context.history().intersects(box).filter(isAddressable).map(function(d) {
- var loc = context.projection([
- (extent[0][0] + extent[1][0]) / 2,
- (extent[0][1] + extent[1][1]) / 2
- ]);
- var choice = geoChooseEdge(context.graph().childNodes(d), loc, context.projection);
- return {
- title: d.tags.name,
- value: d.tags.name,
- dist: choice.distance
- };
- }).sort(function(a, b) {
- return a.dist - b.dist;
- });
- return utilArrayUniqBy(streets, "value");
- function isAddressable(d) {
- return d.tags.highway && d.tags.name && d.type === "way";
- }
+ function scale(transform2, k2) {
+ k2 = Math.max(scaleExtent[0], Math.min(scaleExtent[1], k2));
+ return k2 === transform2.k ? transform2 : new Transform(k2, transform2.x, transform2.y);
}
- function getNearCities() {
- var extent = combinedEntityExtent();
- var l = extent.center();
- var box = geoExtent(l).padByMeters(200);
- var cities = context.history().intersects(box).filter(isAddressable).map(function(d) {
- return {
- title: d.tags["addr:city"] || d.tags.name,
- value: d.tags["addr:city"] || d.tags.name,
- dist: geoSphericalDistance(d.extent(context.graph()).center(), l)
- };
- }).sort(function(a, b) {
- return a.dist - b.dist;
- });
- return utilArrayUniqBy(cities, "value");
- function isAddressable(d) {
- if (d.tags.name) {
- if (d.tags.admin_level === "8" && d.tags.boundary === "administrative")
- return true;
- if (d.tags.border_type === "city")
- return true;
- if (d.tags.place === "city" || d.tags.place === "town" || d.tags.place === "village")
- return true;
- }
- if (d.tags["addr:city"])
- return true;
- return false;
- }
+ function translate(transform2, p02, p1) {
+ var x2 = p02[0] - p1[0] * transform2.k, y2 = p02[1] - p1[1] * transform2.k;
+ return x2 === transform2.x && y2 === transform2.y ? transform2 : new Transform(transform2.k, x2, y2);
}
- function getNearValues(key) {
- var extent = combinedEntityExtent();
- var l = extent.center();
- var box = geoExtent(l).padByMeters(200);
- var results = context.history().intersects(box).filter(function hasTag(d) {
- return _entityIDs.indexOf(d.id) === -1 && d.tags[key];
- }).map(function(d) {
- return {
- title: d.tags[key],
- value: d.tags[key],
- dist: geoSphericalDistance(d.extent(context.graph()).center(), l)
+ function centroid(extent2) {
+ return [(+extent2[0][0] + +extent2[1][0]) / 2, (+extent2[0][1] + +extent2[1][1]) / 2];
+ }
+ function schedule(transition2, transform2, point) {
+ transition2.on("start.zoom", function() {
+ gesture(this, arguments).start(null);
+ }).on("interrupt.zoom end.zoom", function() {
+ gesture(this, arguments).end(null);
+ }).tween("zoom", function() {
+ var that = this, args = arguments, g3 = gesture(that, args), e3 = extent.apply(that, args), p2 = !point ? centroid(e3) : typeof point === "function" ? point.apply(that, args) : point, w2 = Math.max(e3[1][0] - e3[0][0], e3[1][1] - e3[0][1]), a2 = _transform, b2 = typeof transform2 === "function" ? transform2.apply(that, args) : transform2, i3 = interpolate(a2.invert(p2).concat(w2 / a2.k), b2.invert(p2).concat(w2 / b2.k));
+ return function(t2) {
+ if (t2 === 1) {
+ t2 = b2;
+ } else {
+ var l2 = i3(t2);
+ var k2 = w2 / l2[2];
+ t2 = new Transform(k2, p2[0] - l2[0] * k2, p2[1] - l2[1] * k2);
+ }
+ g3.zoom(null, null, t2);
};
- }).sort(function(a, b) {
- return a.dist - b.dist;
});
- return utilArrayUniqBy(results, "value");
}
- function updateForCountryCode() {
- if (!_countryCode)
- return;
- var addressFormat;
- for (var i2 = 0; i2 < _addressFormats.length; i2++) {
- var format2 = _addressFormats[i2];
- if (!format2.countryCodes) {
- addressFormat = format2;
- } else if (format2.countryCodes.indexOf(_countryCode) !== -1) {
- addressFormat = format2;
- break;
+ function gesture(that, args, clean2) {
+ return !clean2 && _activeGesture || new Gesture(that, args);
+ }
+ function Gesture(that, args) {
+ this.that = that;
+ this.args = args;
+ this.active = 0;
+ this.extent = extent.apply(that, args);
+ }
+ Gesture.prototype = {
+ start: function(d3_event) {
+ if (++this.active === 1) {
+ _activeGesture = this;
+ dispatch14.call("start", this, d3_event);
+ }
+ return this;
+ },
+ zoom: function(d3_event, key, transform2) {
+ if (this.mouse && key !== "mouse") this.mouse[1] = transform2.invert(this.mouse[0]);
+ if (this.pointer0 && key !== "touch") this.pointer0[1] = transform2.invert(this.pointer0[0]);
+ if (this.pointer1 && key !== "touch") this.pointer1[1] = transform2.invert(this.pointer1[0]);
+ _transform = transform2;
+ dispatch14.call("zoom", this, d3_event, key, transform2);
+ return this;
+ },
+ end: function(d3_event) {
+ if (--this.active === 0) {
+ _activeGesture = null;
+ dispatch14.call("end", this, d3_event);
}
+ return this;
}
- var dropdowns = addressFormat.dropdowns || [
- "city",
- "county",
- "country",
- "district",
- "hamlet",
- "neighbourhood",
- "place",
- "postcode",
- "province",
- "quarter",
- "state",
- "street",
- "subdistrict",
- "suburb"
- ];
- var widths = addressFormat.widths || {
- housenumber: 1 / 3,
- street: 2 / 3,
- city: 2 / 3,
- state: 1 / 4,
- postcode: 1 / 3
- };
- function row(r) {
- var total = r.reduce(function(sum, key) {
- return sum + (widths[key] || 0.5);
- }, 0);
- return r.map(function(key) {
- return {
- id: key,
- width: (widths[key] || 0.5) / total
- };
- });
+ };
+ function wheeled(d3_event) {
+ if (!filter2.apply(this, arguments)) return;
+ var g3 = gesture(this, arguments), t2 = _transform, k2 = Math.max(scaleExtent[0], Math.min(scaleExtent[1], t2.k * Math.pow(2, wheelDelta.apply(this, arguments)))), p2 = utilFastMouse(this)(d3_event);
+ if (g3.wheel) {
+ if (g3.mouse[0][0] !== p2[0] || g3.mouse[0][1] !== p2[1]) {
+ g3.mouse[1] = t2.invert(g3.mouse[0] = p2);
+ }
+ clearTimeout(g3.wheel);
+ } else {
+ g3.mouse = [p2, t2.invert(p2)];
+ interrupt_default(this);
+ g3.start(d3_event);
}
- var rows = _wrap.selectAll(".addr-row").data(addressFormat.format, function(d) {
- return d.toString();
- });
- rows.exit().remove();
- rows.enter().append("div").attr("class", "addr-row").selectAll("input").data(row).enter().append("input").property("type", "text").call(updatePlaceholder).attr("class", function(d) {
- return "addr-" + d.id;
- }).call(utilNoAuto).each(addDropdown).style("width", function(d) {
- return d.width * 100 + "%";
- });
- function addDropdown(d) {
- if (dropdowns.indexOf(d.id) === -1)
- return;
- var nearValues = d.id === "street" ? getNearStreets : d.id === "city" ? getNearCities : getNearValues;
- select_default2(this).call(uiCombobox(context, "address-" + d.id).minItems(1).caseSensitive(true).fetcher(function(value, callback) {
- callback(nearValues("addr:" + d.id));
- }));
+ d3_event.preventDefault();
+ d3_event.stopImmediatePropagation();
+ g3.wheel = setTimeout(wheelidled, _wheelDelay);
+ g3.zoom(d3_event, "mouse", constrain(translate(scale(t2, k2), g3.mouse[0], g3.mouse[1]), g3.extent, translateExtent));
+ function wheelidled() {
+ g3.wheel = null;
+ g3.end(d3_event);
}
- _wrap.selectAll("input").on("blur", change()).on("change", change());
- _wrap.selectAll("input:not(.combobox-input)").on("input", change(true));
- if (_tags)
- updateTags(_tags);
}
- function address(selection2) {
- _selection = selection2;
- _wrap = selection2.selectAll(".form-field-input-wrap").data([0]);
- _wrap = _wrap.enter().append("div").attr("class", "form-field-input-wrap form-field-input-" + field.type).merge(_wrap);
- var extent = combinedEntityExtent();
- if (extent) {
- var countryCode;
- if (context.inIntro()) {
- countryCode = _t("intro.graph.countrycode");
- } else {
- var center = extent.center();
- countryCode = iso1A2Code(center);
- }
- if (countryCode) {
- _countryCode = countryCode.toLowerCase();
- updateForCountryCode();
- }
+ var _downPointerIDs = /* @__PURE__ */ new Set();
+ var _pointerLocGetter;
+ function pointerdown(d3_event) {
+ _downPointerIDs.add(d3_event.pointerId);
+ if (!filter2.apply(this, arguments)) return;
+ var g3 = gesture(this, arguments, _downPointerIDs.size === 1);
+ var started;
+ d3_event.stopImmediatePropagation();
+ _pointerLocGetter = utilFastMouse(this);
+ var loc = _pointerLocGetter(d3_event);
+ var p2 = [loc, _transform.invert(loc), d3_event.pointerId];
+ if (!g3.pointer0) {
+ g3.pointer0 = p2;
+ started = true;
+ } else if (!g3.pointer1 && g3.pointer0[2] !== p2[2]) {
+ g3.pointer1 = p2;
+ }
+ if (started) {
+ interrupt_default(this);
+ g3.start(d3_event);
}
}
- function change(onInput) {
- return function() {
- var tags = {};
- _wrap.selectAll("input").each(function(subfield) {
- var key = field.key + ":" + subfield.id;
- var value = this.value;
- if (!onInput)
- value = context.cleanTagValue(value);
- if (Array.isArray(_tags[key]) && !value)
- return;
- tags[key] = value || void 0;
- });
- dispatch10.call("change", this, tags, onInput);
- };
- }
- function updatePlaceholder(inputSelection) {
- return inputSelection.attr("placeholder", function(subfield) {
- if (_tags && Array.isArray(_tags[field.key + ":" + subfield.id])) {
- return _t("inspector.multiple_values");
- }
- if (_countryCode) {
- var localkey = subfield.id + "!" + _countryCode;
- var tkey = addrField.hasTextForStringId("placeholders." + localkey) ? localkey : subfield.id;
- return addrField.t("placeholders." + tkey);
- }
- });
- }
- function updateTags(tags) {
- utilGetSetValue(_wrap.selectAll("input"), function(subfield) {
- var val = tags[field.key + ":" + subfield.id];
- return typeof val === "string" ? val : "";
- }).attr("title", function(subfield) {
- var val = tags[field.key + ":" + subfield.id];
- return val && Array.isArray(val) ? val.filter(Boolean).join("\n") : void 0;
- }).classed("mixed", function(subfield) {
- return Array.isArray(tags[field.key + ":" + subfield.id]);
- }).call(updatePlaceholder);
+ function pointermove(d3_event) {
+ if (!_downPointerIDs.has(d3_event.pointerId)) return;
+ if (!_activeGesture || !_pointerLocGetter) return;
+ var g3 = gesture(this, arguments);
+ var isPointer0 = g3.pointer0 && g3.pointer0[2] === d3_event.pointerId;
+ var isPointer1 = !isPointer0 && g3.pointer1 && g3.pointer1[2] === d3_event.pointerId;
+ if ((isPointer0 || isPointer1) && "buttons" in d3_event && !d3_event.buttons) {
+ if (g3.pointer0) _downPointerIDs.delete(g3.pointer0[2]);
+ if (g3.pointer1) _downPointerIDs.delete(g3.pointer1[2]);
+ g3.end(d3_event);
+ return;
+ }
+ d3_event.preventDefault();
+ d3_event.stopImmediatePropagation();
+ var loc = _pointerLocGetter(d3_event);
+ var t2, p2, l2;
+ if (isPointer0) g3.pointer0[0] = loc;
+ else if (isPointer1) g3.pointer1[0] = loc;
+ t2 = _transform;
+ if (g3.pointer1) {
+ var p02 = g3.pointer0[0], l0 = g3.pointer0[1], p1 = g3.pointer1[0], l1 = g3.pointer1[1], dp = (dp = p1[0] - p02[0]) * dp + (dp = p1[1] - p02[1]) * dp, dl = (dl = l1[0] - l0[0]) * dl + (dl = l1[1] - l0[1]) * dl;
+ t2 = scale(t2, Math.sqrt(dp / dl));
+ p2 = [(p02[0] + p1[0]) / 2, (p02[1] + p1[1]) / 2];
+ l2 = [(l0[0] + l1[0]) / 2, (l0[1] + l1[1]) / 2];
+ } else if (g3.pointer0) {
+ p2 = g3.pointer0[0];
+ l2 = g3.pointer0[1];
+ } else {
+ return;
+ }
+ g3.zoom(d3_event, "touch", constrain(translate(t2, p2, l2), g3.extent, translateExtent));
}
- function combinedEntityExtent() {
- return _entityIDs && _entityIDs.length && utilTotalExtent(_entityIDs, context.graph());
+ function pointerup(d3_event) {
+ if (!_downPointerIDs.has(d3_event.pointerId)) return;
+ _downPointerIDs.delete(d3_event.pointerId);
+ if (!_activeGesture) return;
+ var g3 = gesture(this, arguments);
+ d3_event.stopImmediatePropagation();
+ if (g3.pointer0 && g3.pointer0[2] === d3_event.pointerId) delete g3.pointer0;
+ else if (g3.pointer1 && g3.pointer1[2] === d3_event.pointerId) delete g3.pointer1;
+ if (g3.pointer1 && !g3.pointer0) {
+ g3.pointer0 = g3.pointer1;
+ delete g3.pointer1;
+ }
+ if (g3.pointer0) {
+ g3.pointer0[1] = _transform.invert(g3.pointer0[0]);
+ } else {
+ g3.end(d3_event);
+ }
}
- address.entityIDs = function(val) {
- if (!arguments.length)
- return _entityIDs;
- _entityIDs = val;
- return address;
+ zoom.wheelDelta = function(_2) {
+ return arguments.length ? (wheelDelta = utilFunctor(+_2), zoom) : wheelDelta;
};
- address.tags = function(tags) {
- _tags = tags;
- updateTags(tags);
+ zoom.filter = function(_2) {
+ return arguments.length ? (filter2 = utilFunctor(!!_2), zoom) : filter2;
};
- address.focus = function() {
- var node = _wrap.selectAll("input").node();
- if (node)
- node.focus();
+ zoom.extent = function(_2) {
+ return arguments.length ? (extent = utilFunctor([[+_2[0][0], +_2[0][1]], [+_2[1][0], +_2[1][1]]]), zoom) : extent;
+ };
+ zoom.scaleExtent = function(_2) {
+ return arguments.length ? (scaleExtent[0] = +_2[0], scaleExtent[1] = +_2[1], zoom) : [scaleExtent[0], scaleExtent[1]];
};
- return utilRebind(address, dispatch10, "on");
+ zoom.translateExtent = function(_2) {
+ return arguments.length ? (translateExtent[0][0] = +_2[0][0], translateExtent[1][0] = +_2[1][0], translateExtent[0][1] = +_2[0][1], translateExtent[1][1] = +_2[1][1], zoom) : [[translateExtent[0][0], translateExtent[0][1]], [translateExtent[1][0], translateExtent[1][1]]];
+ };
+ zoom.constrain = function(_2) {
+ return arguments.length ? (constrain = _2, zoom) : constrain;
+ };
+ zoom.interpolate = function(_2) {
+ return arguments.length ? (interpolate = _2, zoom) : interpolate;
+ };
+ zoom._transform = function(_2) {
+ return arguments.length ? (_transform = _2, zoom) : _transform;
+ };
+ return utilRebind(zoom, dispatch14, "on");
}
- // modules/ui/fields/cycleway.js
- function uiFieldCycleway(field, context) {
- var dispatch10 = dispatch_default("change");
- var items = select_default2(null);
- var wrap2 = select_default2(null);
- var _tags;
- function cycleway(selection2) {
- function stripcolon(s) {
- return s.replace(":", "");
- }
- wrap2 = selection2.selectAll(".form-field-input-wrap").data([0]);
- wrap2 = wrap2.enter().append("div").attr("class", "form-field-input-wrap form-field-input-" + field.type).merge(wrap2);
- var div = wrap2.selectAll("ul").data([0]);
- div = div.enter().append("ul").attr("class", "rows").merge(div);
- var keys = ["cycleway:left", "cycleway:right"];
- items = div.selectAll("li").data(keys);
- var enter = items.enter().append("li").attr("class", function(d) {
- return "labeled-input preset-cycleway-" + stripcolon(d);
- });
- enter.append("span").attr("class", "label preset-label-cycleway").attr("for", function(d) {
- return "preset-input-cycleway-" + stripcolon(d);
- }).html(function(d) {
- return field.t.html("types." + d);
- });
- enter.append("div").attr("class", "preset-input-cycleway-wrap").append("input").attr("type", "text").attr("class", function(d) {
- return "preset-input-cycleway preset-input-" + stripcolon(d);
- }).call(utilNoAuto).each(function(d) {
- select_default2(this).call(uiCombobox(context, "cycleway-" + stripcolon(d)).data(cycleway.options(d)));
- });
- items = items.merge(enter);
- wrap2.selectAll(".preset-input-cycleway").on("change", change).on("blur", change);
+ // modules/util/double_up.js
+ function utilDoubleUp() {
+ var dispatch14 = dispatch_default("doubleUp");
+ var _maxTimespan = 500;
+ var _maxDistance = 20;
+ var _pointer;
+ function pointerIsValidFor(loc) {
+ return (/* @__PURE__ */ new Date()).getTime() - _pointer.startTime <= _maxTimespan && // all pointer events must occur within a small distance of the first pointerdown
+ geoVecLength(_pointer.startLoc, loc) <= _maxDistance;
}
- function change(d3_event, key) {
- var newValue = context.cleanTagValue(utilGetSetValue(select_default2(this)));
- if (!newValue && (Array.isArray(_tags.cycleway) || Array.isArray(_tags[key])))
- return;
- if (newValue === "none" || newValue === "") {
- newValue = void 0;
- }
- var otherKey = key === "cycleway:left" ? "cycleway:right" : "cycleway:left";
- var otherValue = typeof _tags.cycleway === "string" ? _tags.cycleway : _tags[otherKey];
- if (otherValue && Array.isArray(otherValue)) {
- otherValue = otherValue[0];
- }
- if (otherValue === "none" || otherValue === "") {
- otherValue = void 0;
- }
- var tag = {};
- if (newValue === otherValue) {
- tag = {
- cycleway: newValue,
- "cycleway:left": void 0,
- "cycleway:right": void 0
+ function pointerdown(d3_event) {
+ if (d3_event.ctrlKey || d3_event.button === 2) return;
+ var loc = [d3_event.clientX, d3_event.clientY];
+ if (_pointer && !pointerIsValidFor(loc)) {
+ _pointer = void 0;
+ }
+ if (!_pointer) {
+ _pointer = {
+ startLoc: loc,
+ startTime: (/* @__PURE__ */ new Date()).getTime(),
+ upCount: 0,
+ pointerId: d3_event.pointerId
};
} else {
- tag = {
- cycleway: void 0
- };
- tag[key] = newValue;
- tag[otherKey] = otherValue;
+ _pointer.pointerId = d3_event.pointerId;
}
- dispatch10.call("change", this, tag);
}
- cycleway.options = function() {
- return field.options.map(function(option) {
- return {
- title: field.t("options." + option + ".description"),
- value: option
- };
- });
- };
- cycleway.tags = function(tags) {
- _tags = tags;
- var commonValue = typeof tags.cycleway === "string" && tags.cycleway;
- utilGetSetValue(items.selectAll(".preset-input-cycleway"), function(d) {
- if (commonValue)
- return commonValue;
- return !tags.cycleway && typeof tags[d] === "string" ? tags[d] : "";
- }).attr("title", function(d) {
- if (Array.isArray(tags.cycleway) || Array.isArray(tags[d])) {
- var vals = [];
- if (Array.isArray(tags.cycleway)) {
- vals = vals.concat(tags.cycleway);
- }
- if (Array.isArray(tags[d])) {
- vals = vals.concat(tags[d]);
- }
- return vals.filter(Boolean).join("\n");
- }
- return null;
- }).attr("placeholder", function(d) {
- if (Array.isArray(tags.cycleway) || Array.isArray(tags[d])) {
- return _t("inspector.multiple_values");
+ function pointerup(d3_event) {
+ if (d3_event.ctrlKey || d3_event.button === 2) return;
+ if (!_pointer || _pointer.pointerId !== d3_event.pointerId) return;
+ _pointer.upCount += 1;
+ if (_pointer.upCount === 2) {
+ var loc = [d3_event.clientX, d3_event.clientY];
+ if (pointerIsValidFor(loc)) {
+ var locInThis = utilFastMouse(this)(d3_event);
+ dispatch14.call("doubleUp", this, d3_event, locInThis);
}
- return field.placeholder();
- }).classed("mixed", function(d) {
- return Array.isArray(tags.cycleway) || Array.isArray(tags[d]);
- });
- };
- cycleway.focus = function() {
- var node = wrap2.selectAll("input").node();
- if (node)
- node.focus();
- };
- return utilRebind(cycleway, dispatch10, "on");
- }
-
- // modules/ui/fields/lanes.js
- function uiFieldLanes(field, context) {
- var dispatch10 = dispatch_default("change");
- var LANE_WIDTH = 40;
- var LANE_HEIGHT = 200;
- var _entityIDs = [];
- function lanes(selection2) {
- var lanesData = context.entity(_entityIDs[0]).lanes();
- if (!context.container().select(".inspector-wrap.inspector-hidden").empty() || !selection2.node().parentNode) {
- selection2.call(lanes.off);
- return;
+ _pointer = void 0;
}
- var wrap2 = selection2.selectAll(".form-field-input-wrap").data([0]);
- wrap2 = wrap2.enter().append("div").attr("class", "form-field-input-wrap form-field-input-" + field.type).merge(wrap2);
- var surface = wrap2.selectAll(".surface").data([0]);
- var d = utilGetDimensions(wrap2);
- var freeSpace = d[0] - lanesData.lanes.length * LANE_WIDTH * 1.5 + LANE_WIDTH * 0.5;
- surface = surface.enter().append("svg").attr("width", d[0]).attr("height", 300).attr("class", "surface").merge(surface);
- var lanesSelection = surface.selectAll(".lanes").data([0]);
- lanesSelection = lanesSelection.enter().append("g").attr("class", "lanes").merge(lanesSelection);
- lanesSelection.attr("transform", function() {
- return "translate(" + freeSpace / 2 + ", 0)";
- });
- var lane = lanesSelection.selectAll(".lane").data(lanesData.lanes);
- lane.exit().remove();
- var enter = lane.enter().append("g").attr("class", "lane");
- enter.append("g").append("rect").attr("y", 50).attr("width", LANE_WIDTH).attr("height", LANE_HEIGHT);
- enter.append("g").attr("class", "forward").append("text").attr("y", 40).attr("x", 14).text("\u25B2");
- enter.append("g").attr("class", "bothways").append("text").attr("y", 40).attr("x", 14).text("\u25B2\u25BC");
- enter.append("g").attr("class", "backward").append("text").attr("y", 40).attr("x", 14).text("\u25BC");
- lane = lane.merge(enter);
- lane.attr("transform", function(d2) {
- return "translate(" + LANE_WIDTH * d2.index * 1.5 + ", 0)";
- });
- lane.select(".forward").style("visibility", function(d2) {
- return d2.direction === "forward" ? "visible" : "hidden";
- });
- lane.select(".bothways").style("visibility", function(d2) {
- return d2.direction === "bothways" ? "visible" : "hidden";
- });
- lane.select(".backward").style("visibility", function(d2) {
- return d2.direction === "backward" ? "visible" : "hidden";
- });
}
- lanes.entityIDs = function(val) {
- _entityIDs = val;
- };
- lanes.tags = function() {
- };
- lanes.focus = function() {
- };
- lanes.off = function() {
+ function doubleUp(selection2) {
+ if ("PointerEvent" in window) {
+ selection2.on("pointerdown.doubleUp", pointerdown).on("pointerup.doubleUp", pointerup);
+ } else {
+ selection2.on("dblclick.doubleUp", function(d3_event) {
+ dispatch14.call("doubleUp", this, d3_event, utilFastMouse(this)(d3_event));
+ });
+ }
+ }
+ doubleUp.off = function(selection2) {
+ selection2.on("pointerdown.doubleUp", null).on("pointerup.doubleUp", null).on("dblclick.doubleUp", null);
};
- return utilRebind(lanes, dispatch10, "on");
+ return utilRebind(doubleUp, dispatch14, "on");
}
- uiFieldLanes.supportsMultiselection = false;
- // modules/ui/fields/localized.js
- var _languagesArray = [];
- function uiFieldLocalized(field, context) {
- var dispatch10 = dispatch_default("change", "input");
- var wikipedia = services.wikipedia;
- var input = select_default2(null);
- var localizedInputs = select_default2(null);
- var _countryCode;
- var _tags;
- _mainFileFetcher.get("languages").then(loadLanguagesArray).catch(function() {
- });
- var _territoryLanguages = {};
- _mainFileFetcher.get("territory_languages").then(function(d) {
- _territoryLanguages = d;
- }).catch(function() {
- });
- var langCombo = uiCombobox(context, "localized-lang").fetcher(fetchLanguages).minItems(0);
+ // modules/renderer/map.js
+ var TILESIZE = 256;
+ var minZoom2 = 2;
+ var maxZoom = 24;
+ var kMin = geoZoomToScale(minZoom2, TILESIZE);
+ var kMax = geoZoomToScale(maxZoom, TILESIZE);
+ function clamp2(num, min3, max3) {
+ return Math.max(min3, Math.min(num, max3));
+ }
+ function rendererMap(context) {
+ var dispatch14 = dispatch_default(
+ "move",
+ "drawn",
+ "crossEditableZoom",
+ "hitMinZoom",
+ "changeHighlighting",
+ "changeAreaFill"
+ );
+ var projection2 = context.projection;
+ var curtainProjection = context.curtainProjection;
+ var drawLayers;
+ var drawPoints;
+ var drawVertices;
+ var drawLines;
+ var drawAreas;
+ var drawMidpoints;
+ var drawLabels;
var _selection = select_default2(null);
- var _multilingual = [];
- var _buttonTip = uiTooltip().title(_t.html("translate.translate")).placement("left");
- var _wikiTitles;
- var _entityIDs = [];
- function loadLanguagesArray(dataLanguages) {
- if (_languagesArray.length !== 0)
- return;
- var replacements = {
- sr: "sr-Cyrl",
- "sr-Cyrl": false
- };
- for (var code in dataLanguages) {
- if (replacements[code] === false)
- continue;
- var metaCode = code;
- if (replacements[code])
- metaCode = replacements[code];
- _languagesArray.push({
- localName: _mainLocalizer.languageName(metaCode, { localOnly: true }),
- nativeName: dataLanguages[metaCode].nativeName,
- code,
- label: _mainLocalizer.languageName(metaCode)
- });
- }
+ var supersurface = select_default2(null);
+ var wrapper = select_default2(null);
+ var surface = select_default2(null);
+ var _dimensions = [1, 1];
+ var _dblClickZoomEnabled = true;
+ var _redrawEnabled = true;
+ var _gestureTransformStart;
+ var _transformStart = projection2.transform();
+ var _transformLast;
+ var _isTransformed = false;
+ var _minzoom = 0;
+ var _getMouseCoords;
+ var _lastPointerEvent;
+ var _lastWithinEditableZoom;
+ var _pointerDown = false;
+ var _pointerPrefix = "PointerEvent" in window ? "pointer" : "mouse";
+ var _zoomerPannerFunction = "PointerEvent" in window ? utilZoomPan : zoom_default2;
+ var _zoomerPanner = _zoomerPannerFunction().scaleExtent([kMin, kMax]).interpolate(value_default).filter(zoomEventFilter).on("zoom.map", zoomPan2).on("start.map", function(d3_event) {
+ _pointerDown = d3_event && (d3_event.type === "pointerdown" || d3_event.sourceEvent && d3_event.sourceEvent.type === "pointerdown");
+ }).on("end.map", function() {
+ _pointerDown = false;
+ });
+ var _doubleUpHandler = utilDoubleUp();
+ var scheduleRedraw = throttle_default(redraw, 750);
+ function cancelPendingRedraw() {
+ scheduleRedraw.cancel();
}
- function calcLocked() {
- var isLocked = field.id === "name" && _entityIDs.length && _entityIDs.some(function(entityID) {
- var entity = context.graph().hasEntity(entityID);
- if (!entity)
- return false;
- if (entity.tags.wikidata)
- return true;
- if (entity.tags["name:etymology:wikidata"])
- return true;
- var preset = _mainPresetIndex.match(entity, context.graph());
- if (preset) {
- var isSuggestion = preset.suggestion;
- var fields = preset.fields();
- var showsBrandField = fields.some(function(d) {
- return d.id === "brand";
- });
- var showsOperatorField = fields.some(function(d) {
- return d.id === "operator";
- });
- var setsName = preset.addTags.name;
- var setsBrandWikidata = preset.addTags["brand:wikidata"];
- var setsOperatorWikidata = preset.addTags["operator:wikidata"];
- return isSuggestion && setsName && (setsBrandWikidata && !showsBrandField || setsOperatorWikidata && !showsOperatorField);
+ function map2(selection2) {
+ _selection = selection2;
+ context.on("change.map", immediateRedraw);
+ var osm = context.connection();
+ if (osm) {
+ osm.on("change.map", immediateRedraw);
+ }
+ function didUndoOrRedo(targetTransform) {
+ var mode = context.mode().id;
+ if (mode !== "browse" && mode !== "select") return;
+ if (targetTransform) {
+ map2.transformEase(targetTransform);
}
- return false;
+ }
+ context.history().on("merge.map", function() {
+ scheduleRedraw();
+ }).on("change.map", immediateRedraw).on("undone.map", function(stack, fromStack) {
+ didUndoOrRedo(fromStack.transform);
+ }).on("redone.map", function(stack) {
+ didUndoOrRedo(stack.transform);
+ });
+ context.background().on("change.map", immediateRedraw);
+ context.features().on("redraw.map", immediateRedraw);
+ drawLayers.on("change.map", function() {
+ context.background().updateImagery();
+ immediateRedraw();
+ });
+ selection2.on("wheel.map mousewheel.map", function(d3_event) {
+ d3_event.preventDefault();
+ }).call(_zoomerPanner).call(_zoomerPanner.transform, projection2.transform()).on("dblclick.zoom", null);
+ map2.supersurface = supersurface = selection2.append("div").attr("class", "supersurface").call(utilSetTransform, 0, 0);
+ wrapper = supersurface.append("div").attr("class", "layer layer-data");
+ map2.surface = surface = wrapper.call(drawLayers).selectAll(".surface");
+ surface.call(drawLabels.observe).call(_doubleUpHandler).on(_pointerPrefix + "down.zoom", function(d3_event) {
+ _lastPointerEvent = d3_event;
+ if (d3_event.button === 2) {
+ d3_event.stopPropagation();
+ }
+ }, true).on(_pointerPrefix + "up.zoom", function(d3_event) {
+ _lastPointerEvent = d3_event;
+ if (resetTransform()) {
+ immediateRedraw();
+ }
+ }).on(_pointerPrefix + "move.map", function(d3_event) {
+ _lastPointerEvent = d3_event;
+ }).on(_pointerPrefix + "over.vertices", function(d3_event) {
+ if (map2.editableDataEnabled() && !_isTransformed) {
+ var hover = d3_event.target.__data__;
+ surface.call(drawVertices.drawHover, context.graph(), hover, map2.extent());
+ dispatch14.call("drawn", this, { full: false });
+ }
+ }).on(_pointerPrefix + "out.vertices", function(d3_event) {
+ if (map2.editableDataEnabled() && !_isTransformed) {
+ var hover = d3_event.relatedTarget && d3_event.relatedTarget.__data__;
+ surface.call(drawVertices.drawHover, context.graph(), hover, map2.extent());
+ dispatch14.call("drawn", this, { full: false });
+ }
+ });
+ var detected = utilDetect();
+ if ("GestureEvent" in window && // Listening for gesture events on iOS 13.4+ breaks double-tapping,
+ // but we only need to do this on desktop Safari anyway. â #7694
+ !detected.isMobileWebKit) {
+ surface.on("gesturestart.surface", function(d3_event) {
+ d3_event.preventDefault();
+ _gestureTransformStart = projection2.transform();
+ }).on("gesturechange.surface", gestureChange);
+ }
+ updateAreaFill();
+ _doubleUpHandler.on("doubleUp.map", function(d3_event, p02) {
+ if (!_dblClickZoomEnabled) return;
+ if (typeof d3_event.target.__data__ === "object" && // or area fills
+ !select_default2(d3_event.target).classed("fill")) return;
+ var zoomOut2 = d3_event.shiftKey;
+ var t2 = projection2.transform();
+ var p1 = t2.invert(p02);
+ t2 = t2.scale(zoomOut2 ? 0.5 : 2);
+ t2.x = p02[0] - p1[0] * t2.k;
+ t2.y = p02[1] - p1[1] * t2.k;
+ map2.transformEase(t2);
+ });
+ context.on("enter.map", function() {
+ if (!map2.editableDataEnabled(
+ true
+ /* skip zoom check */
+ )) return;
+ if (_isTransformed) return;
+ var graph = context.graph();
+ var selectedAndParents = {};
+ context.selectedIDs().forEach(function(id2) {
+ var entity = graph.hasEntity(id2);
+ if (entity) {
+ selectedAndParents[entity.id] = entity;
+ if (entity.type === "node") {
+ graph.parentWays(entity).forEach(function(parent) {
+ selectedAndParents[parent.id] = parent;
+ });
+ }
+ }
+ });
+ var data = Object.values(selectedAndParents);
+ var filter2 = function(d2) {
+ return d2.id in selectedAndParents;
+ };
+ data = context.features().filter(data, graph);
+ surface.call(drawVertices.drawSelected, graph, map2.extent()).call(drawLines, graph, data, filter2).call(drawAreas, graph, data, filter2).call(drawMidpoints, graph, data, filter2, map2.trimmedExtent());
+ dispatch14.call("drawn", this, { full: false });
+ scheduleRedraw();
});
- field.locked(isLocked);
+ map2.dimensions(utilGetDimensions(selection2));
}
- function calcMultilingual(tags) {
- var existingLangsOrdered = _multilingual.map(function(item2) {
- return item2.lang;
- });
- var existingLangs = new Set(existingLangsOrdered.filter(Boolean));
- for (var k in tags) {
- var m = k.match(/^(.*):([a-z]{2,3}(?:-[A-Z][a-z]{3})?(?:-[A-Z]{2})?)$/);
- if (m && m[1] === field.key && m[2]) {
- var item = { lang: m[2], value: tags[k] };
- if (existingLangs.has(item.lang)) {
- _multilingual[existingLangsOrdered.indexOf(item.lang)].value = item.value;
- existingLangs.delete(item.lang);
+ function zoomEventFilter(d3_event) {
+ if (d3_event.type === "mousedown") {
+ var hasOrphan = false;
+ var listeners = window.__on;
+ for (var i3 = 0; i3 < listeners.length; i3++) {
+ var listener = listeners[i3];
+ if (listener.name === "zoom" && listener.type === "mouseup") {
+ hasOrphan = true;
+ break;
+ }
+ }
+ if (hasOrphan) {
+ var event = window.CustomEvent;
+ if (event) {
+ event = new event("mouseup");
} else {
- _multilingual.push(item);
+ event = window.document.createEvent("Event");
+ event.initEvent("mouseup", false, false);
}
+ event.view = window;
+ window.dispatchEvent(event);
}
}
- _multilingual.forEach(function(item2) {
- if (item2.lang && existingLangs.has(item2.lang)) {
- item2.value = "";
- }
- });
+ return d3_event.button !== 2;
}
- function localized(selection2) {
- _selection = selection2;
- calcLocked();
- var isLocked = field.locked();
- var wrap2 = selection2.selectAll(".form-field-input-wrap").data([0]);
- wrap2 = wrap2.enter().append("div").attr("class", "form-field-input-wrap form-field-input-" + field.type).merge(wrap2);
- input = wrap2.selectAll(".localized-main").data([0]);
- input = input.enter().append("input").attr("type", "text").attr("id", field.domId).attr("class", "localized-main").call(utilNoAuto).merge(input);
- input.classed("disabled", !!isLocked).attr("readonly", isLocked || null).on("input", change(true)).on("blur", change()).on("change", change());
- var translateButton = wrap2.selectAll(".localized-add").data([0]);
- translateButton = translateButton.enter().append("button").attr("class", "localized-add form-field-button").attr("aria-label", _t("icons.plus")).call(svgIcon("#iD-icon-plus")).merge(translateButton);
- translateButton.classed("disabled", !!isLocked).call(isLocked ? _buttonTip.destroy : _buttonTip).on("click", addNew);
- if (_tags && !_multilingual.length) {
- calcMultilingual(_tags);
- }
- localizedInputs = selection2.selectAll(".localized-multilingual").data([0]);
- localizedInputs = localizedInputs.enter().append("div").attr("class", "localized-multilingual").merge(localizedInputs);
- localizedInputs.call(renderMultilingual);
- localizedInputs.selectAll("button, input").classed("disabled", !!isLocked).attr("readonly", isLocked || null);
- selection2.selectAll(".combobox-caret").classed("nope", true);
- function addNew(d3_event) {
- d3_event.preventDefault();
- if (field.locked())
- return;
- var defaultLang = _mainLocalizer.languageCode().toLowerCase();
- var langExists = _multilingual.find(function(datum2) {
- return datum2.lang === defaultLang;
+ function pxCenter() {
+ return [_dimensions[0] / 2, _dimensions[1] / 2];
+ }
+ function drawEditable(difference2, extent) {
+ var mode = context.mode();
+ var graph = context.graph();
+ var features = context.features();
+ var all = context.history().intersects(map2.extent());
+ var fullRedraw = false;
+ var data;
+ var set4;
+ var filter2;
+ var applyFeatureLayerFilters = true;
+ if (map2.isInWideSelection()) {
+ data = [];
+ utilEntityAndDeepMemberIDs(mode.selectedIDs(), context.graph()).forEach(function(id2) {
+ var entity = context.hasEntity(id2);
+ if (entity) data.push(entity);
});
- var isLangEn = defaultLang.indexOf("en") > -1;
- if (isLangEn || langExists) {
- defaultLang = "";
- langExists = _multilingual.find(function(datum2) {
- return datum2.lang === defaultLang;
- });
+ fullRedraw = true;
+ filter2 = utilFunctor(true);
+ applyFeatureLayerFilters = false;
+ } else if (difference2) {
+ var complete = difference2.complete(map2.extent());
+ data = Object.values(complete).filter(Boolean);
+ set4 = new Set(Object.keys(complete));
+ filter2 = function(d2) {
+ return set4.has(d2.id);
+ };
+ features.clear(data);
+ } else {
+ if (features.gatherStats(all, graph, _dimensions)) {
+ extent = void 0;
}
- if (!langExists) {
- _multilingual.unshift({ lang: defaultLang, value: "" });
- localizedInputs.call(renderMultilingual);
+ if (extent) {
+ data = context.history().intersects(map2.extent().intersection(extent));
+ set4 = new Set(data.map(function(entity) {
+ return entity.id;
+ }));
+ filter2 = function(d2) {
+ return set4.has(d2.id);
+ };
+ } else {
+ data = all;
+ fullRedraw = true;
+ filter2 = utilFunctor(true);
}
}
- function change(onInput) {
- return function(d3_event) {
- if (field.locked()) {
- d3_event.preventDefault();
- return;
- }
- var val = utilGetSetValue(select_default2(this));
- if (!onInput)
- val = context.cleanTagValue(val);
- if (!val && Array.isArray(_tags[field.key]))
- return;
- var t = {};
- t[field.key] = val || void 0;
- dispatch10.call("change", this, t, onInput);
- };
+ if (applyFeatureLayerFilters) {
+ data = features.filter(data, graph);
+ } else {
+ context.features().resetStats();
}
- }
- function key(lang) {
- return field.key + ":" + lang;
- }
- function changeLang(d3_event, d) {
- var tags = {};
- var lang = utilGetSetValue(select_default2(this)).toLowerCase();
- var language = _languagesArray.find(function(d2) {
- return d2.label.toLowerCase() === lang || d2.localName && d2.localName.toLowerCase() === lang || d2.nativeName && d2.nativeName.toLowerCase() === lang;
- });
- if (language)
- lang = language.code;
- if (d.lang && d.lang !== lang) {
- tags[key(d.lang)] = void 0;
+ if (mode && mode.id === "select") {
+ surface.call(drawVertices.drawSelected, graph, map2.extent());
}
- var newKey = lang && context.cleanTagKey(key(lang));
- var value = utilGetSetValue(select_default2(this.parentNode).selectAll(".localized-value"));
- if (newKey && value) {
- tags[newKey] = value;
- } else if (newKey && _wikiTitles && _wikiTitles[d.lang]) {
- tags[newKey] = _wikiTitles[d.lang];
+ surface.call(drawVertices, graph, data, filter2, map2.extent(), fullRedraw).call(drawLines, graph, data, filter2).call(drawAreas, graph, data, filter2).call(drawMidpoints, graph, data, filter2, map2.trimmedExtent()).call(drawLabels, graph, data, filter2, _dimensions, fullRedraw).call(drawPoints, graph, data, filter2);
+ dispatch14.call("drawn", this, { full: true });
+ }
+ map2.init = function() {
+ drawLayers = svgLayers(projection2, context);
+ drawPoints = svgPoints(projection2, context);
+ drawVertices = svgVertices(projection2, context);
+ drawLines = svgLines(projection2, context);
+ drawAreas = svgAreas(projection2, context);
+ drawMidpoints = svgMidpoints(projection2, context);
+ drawLabels = svgLabels(projection2, context);
+ };
+ function editOff() {
+ context.features().resetStats();
+ surface.selectAll(".layer-osm *").remove();
+ surface.selectAll(".layer-touch:not(.markers) *").remove();
+ var allowed = {
+ "browse": true,
+ "save": true,
+ "select-note": true,
+ "select-data": true,
+ "select-error": true
+ };
+ var mode = context.mode();
+ if (mode && !allowed[mode.id]) {
+ context.enter(modeBrowse(context));
}
- d.lang = lang;
- dispatch10.call("change", this, tags);
+ dispatch14.call("drawn", this, { full: true });
+ }
+ function gestureChange(d3_event) {
+ var e3 = d3_event;
+ e3.preventDefault();
+ var props = {
+ deltaMode: 0,
+ // dummy values to ignore in zoomPan
+ deltaY: 1,
+ // dummy values to ignore in zoomPan
+ clientX: e3.clientX,
+ clientY: e3.clientY,
+ screenX: e3.screenX,
+ screenY: e3.screenY,
+ x: e3.x,
+ y: e3.y
+ };
+ var e22 = new WheelEvent("wheel", props);
+ e22._scale = e3.scale;
+ e22._rotation = e3.rotation;
+ _selection.node().dispatchEvent(e22);
}
- function changeValue(d3_event, d) {
- if (!d.lang)
+ function zoomPan2(event, key, transform2) {
+ var source = event && event.sourceEvent || event;
+ var eventTransform = transform2 || event && event.transform;
+ var x2 = eventTransform.x;
+ var y2 = eventTransform.y;
+ var k2 = eventTransform.k;
+ if (source && source.type === "wheel") {
+ if (_pointerDown) return;
+ var detected = utilDetect();
+ var dX = source.deltaX;
+ var dY = source.deltaY;
+ var x22 = x2;
+ var y22 = y2;
+ var k22 = k2;
+ var t0, p02, p1;
+ if (source.deltaMode === 1) {
+ var lines = Math.abs(source.deltaY);
+ var sign2 = source.deltaY > 0 ? 1 : -1;
+ dY = sign2 * clamp2(
+ Math.exp((lines - 1) * 0.75) * 4.000244140625,
+ 4.000244140625,
+ // min
+ 350.000244140625
+ // max
+ );
+ if (detected.os !== "mac") {
+ dY *= 5;
+ }
+ t0 = _isTransformed ? _transformLast : _transformStart;
+ p02 = _getMouseCoords(source);
+ p1 = t0.invert(p02);
+ k22 = t0.k * Math.pow(2, -dY / 500);
+ k22 = clamp2(k22, kMin, kMax);
+ x22 = p02[0] - p1[0] * k22;
+ y22 = p02[1] - p1[1] * k22;
+ } else if (source._scale) {
+ t0 = _gestureTransformStart;
+ p02 = _getMouseCoords(source);
+ p1 = t0.invert(p02);
+ k22 = t0.k * source._scale;
+ k22 = clamp2(k22, kMin, kMax);
+ x22 = p02[0] - p1[0] * k22;
+ y22 = p02[1] - p1[1] * k22;
+ } else if (source.ctrlKey && !isInteger(dY)) {
+ dY *= 6;
+ t0 = _isTransformed ? _transformLast : _transformStart;
+ p02 = _getMouseCoords(source);
+ p1 = t0.invert(p02);
+ k22 = t0.k * Math.pow(2, -dY / 500);
+ k22 = clamp2(k22, kMin, kMax);
+ x22 = p02[0] - p1[0] * k22;
+ y22 = p02[1] - p1[1] * k22;
+ } else if ((source.altKey || source.shiftKey) && isInteger(dY)) {
+ t0 = _isTransformed ? _transformLast : _transformStart;
+ p02 = _getMouseCoords(source);
+ p1 = t0.invert(p02);
+ k22 = t0.k * Math.pow(2, -dY / 500);
+ k22 = clamp2(k22, kMin, kMax);
+ x22 = p02[0] - p1[0] * k22;
+ y22 = p02[1] - p1[1] * k22;
+ } else if (detected.os === "mac" && detected.browser !== "Firefox" && !source.ctrlKey && isInteger(dX) && isInteger(dY)) {
+ p1 = projection2.translate();
+ x22 = p1[0] - dX;
+ y22 = p1[1] - dY;
+ k22 = projection2.scale();
+ k22 = clamp2(k22, kMin, kMax);
+ }
+ if (x22 !== x2 || y22 !== y2 || k22 !== k2) {
+ x2 = x22;
+ y2 = y22;
+ k2 = k22;
+ eventTransform = identity2.translate(x22, y22).scale(k22);
+ if (_zoomerPanner._transform) {
+ _zoomerPanner._transform(eventTransform);
+ } else {
+ _selection.node().__zoom = eventTransform;
+ }
+ }
+ }
+ if (_transformStart.x === x2 && _transformStart.y === y2 && _transformStart.k === k2) {
return;
- var value = context.cleanTagValue(utilGetSetValue(select_default2(this))) || void 0;
- if (!value && Array.isArray(d.value))
+ }
+ if (geoScaleToZoom(k2, TILESIZE) < _minzoom) {
+ surface.interrupt();
+ dispatch14.call("hitMinZoom", this, map2);
+ setCenterZoom(map2.center(), context.minEditableZoom(), 0, true);
+ scheduleRedraw();
+ dispatch14.call("move", this, map2);
return;
- var t = {};
- t[key(d.lang)] = value;
- d.value = value;
- dispatch10.call("change", this, t);
- }
- function fetchLanguages(value, cb) {
- var v = value.toLowerCase();
- var langCodes = [_mainLocalizer.localeCode(), _mainLocalizer.languageCode()];
- if (_countryCode && _territoryLanguages[_countryCode]) {
- langCodes = langCodes.concat(_territoryLanguages[_countryCode]);
}
- var langItems = [];
- langCodes.forEach(function(code) {
- var langItem = _languagesArray.find(function(item) {
- return item.code === code;
+ projection2.transform(eventTransform);
+ var withinEditableZoom = map2.withinEditableZoom();
+ if (_lastWithinEditableZoom !== withinEditableZoom) {
+ if (_lastWithinEditableZoom !== void 0) {
+ dispatch14.call("crossEditableZoom", this, withinEditableZoom);
+ }
+ _lastWithinEditableZoom = withinEditableZoom;
+ }
+ var scale = k2 / _transformStart.k;
+ var tX = (x2 / scale - _transformStart.x) * scale;
+ var tY = (y2 / scale - _transformStart.y) * scale;
+ if (context.inIntro()) {
+ curtainProjection.transform({
+ x: x2 - tX,
+ y: y2 - tY,
+ k: k2
});
- if (langItem)
- langItems.push(langItem);
- });
- langItems = utilArrayUniq(langItems.concat(_languagesArray));
- cb(langItems.filter(function(d) {
- return d.label.toLowerCase().indexOf(v) >= 0 || d.localName && d.localName.toLowerCase().indexOf(v) >= 0 || d.nativeName && d.nativeName.toLowerCase().indexOf(v) >= 0 || d.code.toLowerCase().indexOf(v) >= 0;
- }).map(function(d) {
- return { value: d.label };
- }));
+ }
+ if (source) {
+ _lastPointerEvent = event;
+ }
+ _isTransformed = true;
+ _transformLast = eventTransform;
+ utilSetTransform(supersurface, tX, tY, scale);
+ scheduleRedraw();
+ dispatch14.call("move", this, map2);
+ function isInteger(val) {
+ return typeof val === "number" && isFinite(val) && Math.floor(val) === val;
+ }
}
- function renderMultilingual(selection2) {
- var entries = selection2.selectAll("div.entry").data(_multilingual, function(d) {
- return d.lang;
- });
- entries.exit().style("top", "0").style("max-height", "240px").transition().duration(200).style("opacity", "0").style("max-height", "0px").remove();
- var entriesEnter = entries.enter().append("div").attr("class", "entry").each(function(_, index) {
- var wrap2 = select_default2(this);
- var domId = utilUniqueDomId(index);
- var label = wrap2.append("label").attr("class", "field-label").attr("for", domId);
- var text2 = label.append("span").attr("class", "label-text");
- text2.append("span").attr("class", "label-textvalue").call(_t.append("translate.localized_translation_label"));
- text2.append("span").attr("class", "label-textannotation");
- label.append("button").attr("class", "remove-icon-multilingual").attr("title", _t("icons.remove")).on("click", function(d3_event, d) {
- if (field.locked())
- return;
- d3_event.preventDefault();
- _multilingual.splice(_multilingual.indexOf(d), 1);
- var langKey = d.lang && key(d.lang);
- if (langKey && langKey in _tags) {
- delete _tags[langKey];
- var t = {};
- t[langKey] = void 0;
- dispatch10.call("change", this, t);
- return;
- }
- renderMultilingual(selection2);
- }).call(svgIcon("#iD-operation-delete"));
- wrap2.append("input").attr("class", "localized-lang").attr("id", domId).attr("type", "text").attr("placeholder", _t("translate.localized_translation_language")).on("blur", changeLang).on("change", changeLang).call(langCombo);
- wrap2.append("input").attr("type", "text").attr("class", "localized-value").on("blur", changeValue).on("change", changeValue);
- });
- entriesEnter.style("margin-top", "0px").style("max-height", "0px").style("opacity", "0").transition().duration(200).style("margin-top", "10px").style("max-height", "240px").style("opacity", "1").on("end", function() {
- select_default2(this).style("max-height", "").style("overflow", "visible");
- });
- entries = entries.merge(entriesEnter);
- entries.order();
- entries.classed("present", true);
- utilGetSetValue(entries.select(".localized-lang"), function(d) {
- var langItem = _languagesArray.find(function(item) {
- return item.code === d.lang;
- });
- if (langItem)
- return langItem.label;
- return d.lang;
- });
- utilGetSetValue(entries.select(".localized-value"), function(d) {
- return typeof d.value === "string" ? d.value : "";
- }).attr("title", function(d) {
- return Array.isArray(d.value) ? d.value.filter(Boolean).join("\n") : null;
- }).attr("placeholder", function(d) {
- return Array.isArray(d.value) ? _t("inspector.multiple_values") : _t("translate.localized_translation_name");
- }).classed("mixed", function(d) {
- return Array.isArray(d.value);
- });
+ function resetTransform() {
+ if (!_isTransformed) return false;
+ utilSetTransform(supersurface, 0, 0);
+ _isTransformed = false;
+ if (context.inIntro()) {
+ curtainProjection.transform(projection2.transform());
+ }
+ return true;
}
- localized.tags = function(tags) {
- _tags = tags;
- if (typeof tags.wikipedia === "string" && !_wikiTitles) {
- _wikiTitles = {};
- var wm = tags.wikipedia.match(/([^:]+):(.+)/);
- if (wm && wm[0] && wm[1]) {
- wikipedia.translations(wm[1], wm[2], function(err, d) {
- if (err || !d)
- return;
- _wikiTitles = d;
- });
+ function redraw(difference2, extent) {
+ if (typeof window === "undefined") return;
+ if (surface.empty() || !_redrawEnabled) return;
+ if (resetTransform()) {
+ difference2 = extent = void 0;
+ }
+ var zoom = map2.zoom();
+ var z2 = String(~~zoom);
+ if (surface.attr("data-zoom") !== z2) {
+ surface.attr("data-zoom", z2);
+ }
+ var lat = map2.center()[1];
+ var lowzoom = linear3().domain([-60, 0, 60]).range([17, 18.5, 17]).clamp(true);
+ surface.classed("low-zoom", zoom <= lowzoom(lat));
+ if (!difference2) {
+ supersurface.call(context.background());
+ wrapper.call(drawLayers);
+ }
+ if (map2.editableDataEnabled() || map2.isInWideSelection()) {
+ context.loadTiles(projection2);
+ drawEditable(difference2, extent);
+ } else {
+ editOff();
+ }
+ _transformStart = projection2.transform();
+ return map2;
+ }
+ var immediateRedraw = function(difference2, extent) {
+ if (!difference2 && !extent) cancelPendingRedraw();
+ redraw(difference2, extent);
+ };
+ map2.lastPointerEvent = function() {
+ return _lastPointerEvent;
+ };
+ map2.mouse = function(d3_event) {
+ var event = d3_event || _lastPointerEvent;
+ if (event) {
+ var s2;
+ while (s2 = event.sourceEvent) {
+ event = s2;
}
+ return _getMouseCoords(event);
}
- var isMixed = Array.isArray(tags[field.key]);
- utilGetSetValue(input, typeof tags[field.key] === "string" ? tags[field.key] : "").attr("title", isMixed ? tags[field.key].filter(Boolean).join("\n") : void 0).attr("placeholder", isMixed ? _t("inspector.multiple_values") : field.placeholder()).classed("mixed", isMixed);
- calcMultilingual(tags);
- _selection.call(localized);
+ return null;
};
- localized.focus = function() {
- input.node().focus();
+ map2.mouseCoordinates = function() {
+ var coord2 = map2.mouse() || pxCenter();
+ return projection2.invert(coord2);
};
- localized.entityIDs = function(val) {
- if (!arguments.length)
- return _entityIDs;
- _entityIDs = val;
- _multilingual = [];
- loadCountryCode();
- return localized;
+ map2.dblclickZoomEnable = function(val) {
+ if (!arguments.length) return _dblClickZoomEnabled;
+ _dblClickZoomEnabled = val;
+ return map2;
};
- function loadCountryCode() {
- var extent = combinedEntityExtent();
- var countryCode = extent && iso1A2Code(extent.center());
- _countryCode = countryCode && countryCode.toLowerCase();
- }
- function combinedEntityExtent() {
- return _entityIDs && _entityIDs.length && utilTotalExtent(_entityIDs, context.graph());
- }
- return utilRebind(localized, dispatch10, "on");
- }
-
- // modules/ui/fields/roadheight.js
- function uiFieldRoadheight(field, context) {
- var dispatch10 = dispatch_default("change");
- var primaryUnitInput = select_default2(null);
- var primaryInput = select_default2(null);
- var secondaryInput = select_default2(null);
- var secondaryUnitInput = select_default2(null);
- var _entityIDs = [];
- var _tags;
- var _isImperial;
- var primaryUnits = [
- {
- value: "m",
- title: _t("inspector.roadheight.meter")
- },
- {
- value: "ft",
- title: _t("inspector.roadheight.foot")
- }
- ];
- var unitCombo = uiCombobox(context, "roadheight-unit").data(primaryUnits);
- function roadheight(selection2) {
- var wrap2 = selection2.selectAll(".form-field-input-wrap").data([0]);
- wrap2 = wrap2.enter().append("div").attr("class", "form-field-input-wrap form-field-input-" + field.type).merge(wrap2);
- primaryInput = wrap2.selectAll("input.roadheight-number").data([0]);
- primaryInput = primaryInput.enter().append("input").attr("type", "text").attr("class", "roadheight-number").attr("id", field.domId).call(utilNoAuto).merge(primaryInput);
- primaryInput.on("change", change).on("blur", change);
- var loc = combinedEntityExtent().center();
- _isImperial = roadHeightUnit(loc) === "ft";
- primaryUnitInput = wrap2.selectAll("input.roadheight-unit").data([0]);
- primaryUnitInput = primaryUnitInput.enter().append("input").attr("type", "text").attr("class", "roadheight-unit").call(unitCombo).merge(primaryUnitInput);
- primaryUnitInput.on("blur", changeUnits).on("change", changeUnits);
- secondaryInput = wrap2.selectAll("input.roadheight-secondary-number").data([0]);
- secondaryInput = secondaryInput.enter().append("input").attr("type", "text").attr("class", "roadheight-secondary-number").call(utilNoAuto).merge(secondaryInput);
- secondaryInput.on("change", change).on("blur", change);
- secondaryUnitInput = wrap2.selectAll("input.roadheight-secondary-unit").data([0]);
- secondaryUnitInput = secondaryUnitInput.enter().append("input").attr("type", "text").call(utilNoAuto).classed("disabled", true).classed("roadheight-secondary-unit", true).attr("readonly", "readonly").merge(secondaryUnitInput);
- function changeUnits() {
- _isImperial = utilGetSetValue(primaryUnitInput) === "ft";
- utilGetSetValue(primaryUnitInput, _isImperial ? "ft" : "m");
- setUnitSuggestions();
- change();
+ map2.redrawEnable = function(val) {
+ if (!arguments.length) return _redrawEnabled;
+ _redrawEnabled = val;
+ return map2;
+ };
+ map2.isTransformed = function() {
+ return _isTransformed;
+ };
+ function setTransform(t2, duration, force) {
+ var t3 = projection2.transform();
+ if (!force && t2.k === t3.k && t2.x === t3.x && t2.y === t3.y) return false;
+ if (duration) {
+ _selection.transition().duration(duration).on("start", function() {
+ map2.startEase();
+ }).call(_zoomerPanner.transform, identity2.translate(t2.x, t2.y).scale(t2.k));
+ } else {
+ projection2.transform(t2);
+ _transformStart = t2;
+ _selection.call(_zoomerPanner.transform, _transformStart);
}
+ return true;
}
- function setUnitSuggestions() {
- utilGetSetValue(primaryUnitInput, _isImperial ? "ft" : "m");
+ function setCenterZoom(loc2, z2, duration, force) {
+ var c2 = map2.center();
+ var z3 = map2.zoom();
+ if (loc2[0] === c2[0] && loc2[1] === c2[1] && z2 === z3 && !force) return false;
+ var proj = geoRawMercator().transform(projection2.transform());
+ var k2 = clamp2(geoZoomToScale(z2, TILESIZE), kMin, kMax);
+ proj.scale(k2);
+ var t2 = proj.translate();
+ var point = proj(loc2);
+ var center = pxCenter();
+ t2[0] += center[0] - point[0];
+ t2[1] += center[1] - point[1];
+ return setTransform(identity2.translate(t2[0], t2[1]).scale(k2), duration, force);
}
- function change() {
- var tag = {};
- var primaryValue = utilGetSetValue(primaryInput).trim();
- var secondaryValue = utilGetSetValue(secondaryInput).trim();
- if (!primaryValue && !secondaryValue && Array.isArray(_tags[field.key]))
- return;
- if (!primaryValue && !secondaryValue) {
- tag[field.key] = void 0;
- } else if (isNaN(primaryValue) || isNaN(secondaryValue) || !_isImperial) {
- tag[field.key] = context.cleanTagValue(primaryValue);
+ map2.pan = function(delta, duration) {
+ var t2 = projection2.translate();
+ var k2 = projection2.scale();
+ t2[0] += delta[0];
+ t2[1] += delta[1];
+ if (duration) {
+ _selection.transition().duration(duration).on("start", function() {
+ map2.startEase();
+ }).call(_zoomerPanner.transform, identity2.translate(t2[0], t2[1]).scale(k2));
} else {
- if (primaryValue !== "") {
- primaryValue = context.cleanTagValue(primaryValue + "'");
- }
- if (secondaryValue !== "") {
- secondaryValue = context.cleanTagValue(secondaryValue + '"');
- }
- tag[field.key] = primaryValue + secondaryValue;
+ projection2.translate(t2);
+ _transformStart = projection2.transform();
+ _selection.call(_zoomerPanner.transform, _transformStart);
+ dispatch14.call("move", this, map2);
+ immediateRedraw();
}
- dispatch10.call("change", this, tag);
+ return map2;
+ };
+ map2.dimensions = function(val) {
+ if (!arguments.length) return _dimensions;
+ _dimensions = val;
+ drawLayers.dimensions(_dimensions);
+ context.background().dimensions(_dimensions);
+ projection2.clipExtent([[0, 0], _dimensions]);
+ _getMouseCoords = utilFastMouse(supersurface.node());
+ scheduleRedraw();
+ return map2;
+ };
+ function zoomIn(delta) {
+ setCenterZoom(map2.center(), ~~map2.zoom() + delta, 250, true);
}
- roadheight.tags = function(tags) {
- _tags = tags;
- var primaryValue = tags[field.key];
- var secondaryValue;
- var isMixed = Array.isArray(primaryValue);
- if (!isMixed) {
- if (primaryValue && (primaryValue.indexOf("'") >= 0 || primaryValue.indexOf('"') >= 0)) {
- secondaryValue = primaryValue.match(/(-?[\d.]+)"/);
- if (secondaryValue !== null) {
- secondaryValue = secondaryValue[1];
- }
- primaryValue = primaryValue.match(/(-?[\d.]+)'/);
- if (primaryValue !== null) {
- primaryValue = primaryValue[1];
+ function zoomOut(delta) {
+ setCenterZoom(map2.center(), ~~map2.zoom() - delta, 250, true);
+ }
+ map2.zoomIn = function() {
+ zoomIn(1);
+ };
+ map2.zoomInFurther = function() {
+ zoomIn(4);
+ };
+ map2.canZoomIn = function() {
+ return map2.zoom() < maxZoom;
+ };
+ map2.zoomOut = function() {
+ zoomOut(1);
+ };
+ map2.zoomOutFurther = function() {
+ zoomOut(4);
+ };
+ map2.canZoomOut = function() {
+ return map2.zoom() > minZoom2;
+ };
+ map2.center = function(loc2) {
+ if (!arguments.length) {
+ return projection2.invert(pxCenter());
+ }
+ if (setCenterZoom(loc2, map2.zoom())) {
+ dispatch14.call("move", this, map2);
+ }
+ scheduleRedraw();
+ return map2;
+ };
+ map2.unobscuredCenterZoomEase = function(loc, zoom) {
+ var offset = map2.unobscuredOffsetPx();
+ var proj = geoRawMercator().transform(projection2.transform());
+ proj.scale(geoZoomToScale(zoom, TILESIZE));
+ var locPx = proj(loc);
+ var offsetLocPx = [locPx[0] + offset[0], locPx[1] + offset[1]];
+ var offsetLoc = proj.invert(offsetLocPx);
+ map2.centerZoomEase(offsetLoc, zoom);
+ };
+ map2.unobscuredOffsetPx = function() {
+ var openPane = context.container().select(".map-panes .map-pane.shown");
+ if (!openPane.empty()) {
+ return [openPane.node().offsetWidth / 2, 0];
+ }
+ return [0, 0];
+ };
+ map2.zoom = function(z2) {
+ if (!arguments.length) {
+ return Math.max(geoScaleToZoom(projection2.scale(), TILESIZE), 0);
+ }
+ if (z2 < _minzoom) {
+ surface.interrupt();
+ dispatch14.call("hitMinZoom", this, map2);
+ z2 = context.minEditableZoom();
+ }
+ if (setCenterZoom(map2.center(), z2)) {
+ dispatch14.call("move", this, map2);
+ }
+ scheduleRedraw();
+ return map2;
+ };
+ map2.centerZoom = function(loc2, z2) {
+ if (setCenterZoom(loc2, z2)) {
+ dispatch14.call("move", this, map2);
+ }
+ scheduleRedraw();
+ return map2;
+ };
+ map2.zoomTo = function(entities) {
+ if (!isArray_default(entities)) {
+ entities = [entities];
+ }
+ if (entities.length === 0) return map2;
+ var extent = entities.map((entity) => entity.extent(context.graph())).reduce((a2, b2) => a2.extend(b2));
+ if (!isFinite(extent.area())) return map2;
+ var z2 = clamp2(map2.trimmedExtentZoom(extent), 0, 20);
+ return map2.centerZoom(extent.center(), z2);
+ };
+ map2.centerEase = function(loc2, duration) {
+ duration = duration || 250;
+ setCenterZoom(loc2, map2.zoom(), duration);
+ return map2;
+ };
+ map2.zoomEase = function(z2, duration) {
+ duration = duration || 250;
+ setCenterZoom(map2.center(), z2, duration, false);
+ return map2;
+ };
+ map2.centerZoomEase = function(loc2, z2, duration) {
+ duration = duration || 250;
+ setCenterZoom(loc2, z2, duration, false);
+ return map2;
+ };
+ map2.transformEase = function(t2, duration) {
+ duration = duration || 250;
+ setTransform(
+ t2,
+ duration,
+ false
+ /* don't force */
+ );
+ return map2;
+ };
+ map2.zoomToEase = function(obj, duration) {
+ var extent;
+ if (Array.isArray(obj)) {
+ obj.forEach(function(entity) {
+ var entityExtent = entity.extent(context.graph());
+ if (!extent) {
+ extent = entityExtent;
+ } else {
+ extent = extent.extend(entityExtent);
}
- _isImperial = true;
- } else if (primaryValue) {
- _isImperial = false;
- }
+ });
+ } else {
+ extent = obj.extent(context.graph());
}
- setUnitSuggestions();
- utilGetSetValue(primaryInput, typeof primaryValue === "string" ? primaryValue : "").attr("title", isMixed ? primaryValue.filter(Boolean).join("\n") : null).attr("placeholder", isMixed ? _t("inspector.multiple_values") : _t("inspector.unknown")).classed("mixed", isMixed);
- utilGetSetValue(secondaryInput, typeof secondaryValue === "string" ? secondaryValue : "").attr("placeholder", isMixed ? _t("inspector.multiple_values") : _isImperial ? "0" : null).classed("mixed", isMixed).classed("disabled", !_isImperial).attr("readonly", _isImperial ? null : "readonly");
- secondaryUnitInput.attr("value", _isImperial ? _t("inspector.roadheight.inch") : null);
+ if (!isFinite(extent.area())) return map2;
+ var z2 = clamp2(map2.trimmedExtentZoom(extent), 0, 20);
+ return map2.centerZoomEase(extent.center(), z2, duration);
};
- roadheight.focus = function() {
- primaryInput.node().focus();
+ map2.startEase = function() {
+ utilBindOnce(surface, _pointerPrefix + "down.ease", function() {
+ map2.cancelEase();
+ });
+ return map2;
};
- roadheight.entityIDs = function(val) {
- _entityIDs = val;
+ map2.cancelEase = function() {
+ _selection.interrupt();
+ return map2;
};
- function combinedEntityExtent() {
- return _entityIDs && _entityIDs.length && utilTotalExtent(_entityIDs, context.graph());
- }
- return utilRebind(roadheight, dispatch10, "on");
- }
-
- // modules/ui/fields/roadspeed.js
- function uiFieldRoadspeed(field, context) {
- var dispatch10 = dispatch_default("change");
- var unitInput = select_default2(null);
- var input = select_default2(null);
- var _entityIDs = [];
- var _tags;
- var _isImperial;
- var speedCombo = uiCombobox(context, "roadspeed");
- var unitCombo = uiCombobox(context, "roadspeed-unit").data(["km/h", "mph"].map(comboValues));
- var metricValues = [20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120];
- var imperialValues = [5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55, 60, 65, 70, 75, 80];
- function roadspeed(selection2) {
- var wrap2 = selection2.selectAll(".form-field-input-wrap").data([0]);
- wrap2 = wrap2.enter().append("div").attr("class", "form-field-input-wrap form-field-input-" + field.type).merge(wrap2);
- input = wrap2.selectAll("input.roadspeed-number").data([0]);
- input = input.enter().append("input").attr("type", "text").attr("class", "roadspeed-number").attr("id", field.domId).call(utilNoAuto).call(speedCombo).merge(input);
- input.on("change", change).on("blur", change);
- var loc = combinedEntityExtent().center();
- _isImperial = roadSpeedUnit(loc) === "mph";
- unitInput = wrap2.selectAll("input.roadspeed-unit").data([0]);
- unitInput = unitInput.enter().append("input").attr("type", "text").attr("class", "roadspeed-unit").attr("aria-label", _t("inspector.speed_unit")).call(unitCombo).merge(unitInput);
- unitInput.on("blur", changeUnits).on("change", changeUnits);
- function changeUnits() {
- _isImperial = utilGetSetValue(unitInput) === "mph";
- utilGetSetValue(unitInput, _isImperial ? "mph" : "km/h");
- setUnitSuggestions();
- change();
+ map2.extent = function(val) {
+ if (!arguments.length) {
+ return new geoExtent(
+ projection2.invert([0, _dimensions[1]]),
+ projection2.invert([_dimensions[0], 0])
+ );
+ } else {
+ var extent = geoExtent(val);
+ map2.centerZoom(extent.center(), map2.extentZoom(extent));
}
- }
- function setUnitSuggestions() {
- speedCombo.data((_isImperial ? imperialValues : metricValues).map(comboValues));
- utilGetSetValue(unitInput, _isImperial ? "mph" : "km/h");
- }
- function comboValues(d) {
- return {
- value: d.toString(),
- title: d.toString()
- };
- }
- function change() {
- var tag = {};
- var value = utilGetSetValue(input).trim();
- if (!value && Array.isArray(_tags[field.key]))
- return;
- if (!value) {
- tag[field.key] = void 0;
- } else if (isNaN(value) || !_isImperial) {
- tag[field.key] = context.cleanTagValue(value);
+ };
+ map2.trimmedExtent = function(val) {
+ if (!arguments.length) {
+ var headerY = 71;
+ var footerY = 30;
+ var pad2 = 10;
+ return new geoExtent(
+ projection2.invert([pad2, _dimensions[1] - footerY - pad2]),
+ projection2.invert([_dimensions[0] - pad2, headerY + pad2])
+ );
} else {
- tag[field.key] = context.cleanTagValue(value + " mph");
+ var extent = geoExtent(val);
+ map2.centerZoom(extent.center(), map2.trimmedExtentZoom(extent));
}
- dispatch10.call("change", this, tag);
+ };
+ function calcExtentZoom(extent, dim) {
+ var tl = projection2([extent[0][0], extent[1][1]]);
+ var br2 = projection2([extent[1][0], extent[0][1]]);
+ var hFactor = (br2[0] - tl[0]) / dim[0];
+ var vFactor = (br2[1] - tl[1]) / dim[1];
+ var hZoomDiff = Math.log(Math.abs(hFactor)) / Math.LN2;
+ var vZoomDiff = Math.log(Math.abs(vFactor)) / Math.LN2;
+ var newZoom = map2.zoom() - Math.max(hZoomDiff, vZoomDiff);
+ return newZoom;
}
- roadspeed.tags = function(tags) {
- _tags = tags;
- var value = tags[field.key];
- var isMixed = Array.isArray(value);
- if (!isMixed) {
- if (value && value.indexOf("mph") >= 0) {
- value = parseInt(value, 10).toString();
- _isImperial = true;
- } else if (value) {
- _isImperial = false;
- }
- }
- setUnitSuggestions();
- utilGetSetValue(input, typeof value === "string" ? value : "").attr("title", isMixed ? value.filter(Boolean).join("\n") : null).attr("placeholder", isMixed ? _t("inspector.multiple_values") : field.placeholder()).classed("mixed", isMixed);
+ map2.extentZoom = function(val) {
+ return calcExtentZoom(geoExtent(val), _dimensions);
};
- roadspeed.focus = function() {
- input.node().focus();
+ map2.trimmedExtentZoom = function(val) {
+ var trimY = 120;
+ var trimX = 40;
+ var trimmed = [_dimensions[0] - trimX, _dimensions[1] - trimY];
+ return calcExtentZoom(geoExtent(val), trimmed);
};
- roadspeed.entityIDs = function(val) {
- _entityIDs = val;
+ map2.withinEditableZoom = function() {
+ return map2.zoom() >= context.minEditableZoom();
};
- function combinedEntityExtent() {
- return _entityIDs && _entityIDs.length && utilTotalExtent(_entityIDs, context.graph());
+ map2.isInWideSelection = function() {
+ return !map2.withinEditableZoom() && context.selectedIDs().length;
+ };
+ map2.editableDataEnabled = function(skipZoomCheck) {
+ var layer = context.layers().layer("osm");
+ if (!layer || !layer.enabled()) return false;
+ return skipZoomCheck || map2.withinEditableZoom();
+ };
+ map2.notesEditable = function() {
+ var layer = context.layers().layer("notes");
+ if (!layer || !layer.enabled()) return false;
+ return map2.withinEditableZoom();
+ };
+ map2.minzoom = function(val) {
+ if (!arguments.length) return _minzoom;
+ _minzoom = val;
+ return map2;
+ };
+ map2.toggleHighlightEdited = function() {
+ surface.classed("highlight-edited", !surface.classed("highlight-edited"));
+ map2.pan([0, 0]);
+ dispatch14.call("changeHighlighting", this);
+ };
+ map2.areaFillOptions = ["wireframe", "partial", "full"];
+ map2.activeAreaFill = function(val) {
+ if (!arguments.length) return corePreferences("area-fill") || "partial";
+ corePreferences("area-fill", val);
+ if (val !== "wireframe") {
+ corePreferences("area-fill-toggle", val);
+ }
+ updateAreaFill();
+ map2.pan([0, 0]);
+ dispatch14.call("changeAreaFill", this);
+ return map2;
+ };
+ map2.toggleWireframe = function() {
+ var activeFill = map2.activeAreaFill();
+ if (activeFill === "wireframe") {
+ activeFill = corePreferences("area-fill-toggle") || "partial";
+ } else {
+ activeFill = "wireframe";
+ }
+ map2.activeAreaFill(activeFill);
+ };
+ function updateAreaFill() {
+ var activeFill = map2.activeAreaFill();
+ map2.areaFillOptions.forEach(function(opt) {
+ surface.classed("fill-" + opt, Boolean(opt === activeFill));
+ });
}
- return utilRebind(roadspeed, dispatch10, "on");
+ map2.layers = () => drawLayers;
+ map2.doubleUpHandler = function() {
+ return _doubleUpHandler;
+ };
+ return utilRebind(map2, dispatch14, "on");
}
- // modules/ui/fields/radio.js
- function uiFieldRadio(field, context) {
- var dispatch10 = dispatch_default("change");
- var placeholder = select_default2(null);
- var wrap2 = select_default2(null);
- var labels = select_default2(null);
- var radios = select_default2(null);
- var radioData = (field.options || field.keys).slice();
- var typeField;
- var layerField;
- var _oldType = {};
- var _entityIDs = [];
- function selectedKey() {
- var node = wrap2.selectAll(".form-field-input-radio label.active input");
- return !node.empty() && node.datum();
- }
- function radio(selection2) {
- selection2.classed("preset-radio", true);
- wrap2 = selection2.selectAll(".form-field-input-wrap").data([0]);
- var enter = wrap2.enter().append("div").attr("class", "form-field-input-wrap form-field-input-radio");
- enter.append("span").attr("class", "placeholder");
- wrap2 = wrap2.merge(enter);
- placeholder = wrap2.selectAll(".placeholder");
- labels = wrap2.selectAll("label").data(radioData);
- enter = labels.enter().append("label");
- enter.append("input").attr("type", "radio").attr("name", field.id).attr("value", function(d) {
- return field.t("options." + d, { "default": d });
- }).attr("checked", false);
- enter.append("span").html(function(d) {
- return field.t.html("options." + d, { "default": d });
- });
- labels = labels.merge(enter);
- radios = labels.selectAll("input").on("change", changeRadio);
+ // modules/renderer/photos.js
+ function rendererPhotos(context) {
+ var dispatch14 = dispatch_default("change");
+ var _layerIDs = ["streetside", "mapillary", "mapillary-map-features", "mapillary-signs", "kartaview", "mapilio", "vegbilder", "panoramax"];
+ var _allPhotoTypes = ["flat", "panoramic"];
+ var _shownPhotoTypes = _allPhotoTypes.slice();
+ var _dateFilters = ["fromDate", "toDate"];
+ var _fromDate;
+ var _toDate;
+ var _usernames;
+ function photos() {
}
- function structureExtras(selection2, tags) {
- var selected = selectedKey() || tags.layer !== void 0;
- var type3 = _mainPresetIndex.field(selected);
- var layer = _mainPresetIndex.field("layer");
- var showLayer = selected === "bridge" || selected === "tunnel" || tags.layer !== void 0;
- var extrasWrap = selection2.selectAll(".structure-extras-wrap").data(selected ? [0] : []);
- extrasWrap.exit().remove();
- extrasWrap = extrasWrap.enter().append("div").attr("class", "structure-extras-wrap").merge(extrasWrap);
- var list = extrasWrap.selectAll("ul").data([0]);
- list = list.enter().append("ul").attr("class", "rows").merge(list);
- if (type3) {
- if (!typeField || typeField.id !== selected) {
- typeField = uiField(context, type3, _entityIDs, { wrap: false }).on("change", changeType);
- }
- typeField.tags(tags);
- } else {
- typeField = null;
- }
- var typeItem = list.selectAll(".structure-type-item").data(typeField ? [typeField] : [], function(d) {
- return d.id;
+ function updateStorage() {
+ if (window.mocha) return;
+ var hash2 = utilStringQs(window.location.hash);
+ var enabled = context.layers().all().filter(function(d2) {
+ return _layerIDs.indexOf(d2.id) !== -1 && d2.layer && d2.layer.supported() && d2.layer.enabled();
+ }).map(function(d2) {
+ return d2.id;
});
- typeItem.exit().remove();
- var typeEnter = typeItem.enter().insert("li", ":first-child").attr("class", "labeled-input structure-type-item");
- typeEnter.append("span").attr("class", "label structure-label-type").attr("for", "preset-input-" + selected).call(_t.append("inspector.radio.structure.type"));
- typeEnter.append("div").attr("class", "structure-input-type-wrap");
- typeItem = typeItem.merge(typeEnter);
- if (typeField) {
- typeItem.selectAll(".structure-input-type-wrap").call(typeField.render);
- }
- if (layer && showLayer) {
- if (!layerField) {
- layerField = uiField(context, layer, _entityIDs, { wrap: false }).on("change", changeLayer);
- }
- layerField.tags(tags);
- field.keys = utilArrayUnion(field.keys, ["layer"]);
+ if (enabled.length) {
+ hash2.photo_overlay = enabled.join(",");
} else {
- layerField = null;
- field.keys = field.keys.filter(function(k) {
- return k !== "layer";
- });
- }
- var layerItem = list.selectAll(".structure-layer-item").data(layerField ? [layerField] : []);
- layerItem.exit().remove();
- var layerEnter = layerItem.enter().append("li").attr("class", "labeled-input structure-layer-item");
- layerEnter.append("span").attr("class", "label structure-label-layer").attr("for", "preset-input-layer").call(_t.append("inspector.radio.structure.layer"));
- layerEnter.append("div").attr("class", "structure-input-layer-wrap");
- layerItem = layerItem.merge(layerEnter);
- if (layerField) {
- layerItem.selectAll(".structure-input-layer-wrap").call(layerField.render);
+ delete hash2.photo_overlay;
}
+ window.location.replace("#" + utilQsString(hash2, true));
}
- function changeType(t, onInput) {
- var key = selectedKey();
- if (!key)
- return;
- var val = t[key];
- if (val !== "no") {
- _oldType[key] = val;
+ photos.overlayLayerIDs = function() {
+ return _layerIDs;
+ };
+ photos.allPhotoTypes = function() {
+ return _allPhotoTypes;
+ };
+ photos.dateFilters = function() {
+ return _dateFilters;
+ };
+ photos.dateFilterValue = function(val) {
+ return val === _dateFilters[0] ? _fromDate : _toDate;
+ };
+ photos.setDateFilter = function(type2, val, updateUrl) {
+ var date = val && new Date(val);
+ if (date && !isNaN(date)) {
+ val = date.toISOString().slice(0, 10);
+ } else {
+ val = null;
}
- if (field.type === "structureRadio") {
- if (val === "no" || key !== "bridge" && key !== "tunnel" || key === "tunnel" && val === "building_passage") {
- t.layer = void 0;
- }
- if (t.layer === void 0) {
- if (key === "bridge" && val !== "no") {
- t.layer = "1";
- }
- if (key === "tunnel" && val !== "no" && val !== "building_passage") {
- t.layer = "-1";
- }
+ if (type2 === _dateFilters[0]) {
+ _fromDate = val;
+ if (_fromDate && _toDate && new Date(_toDate) < new Date(_fromDate)) {
+ _toDate = _fromDate;
}
}
- dispatch10.call("change", this, t, onInput);
- }
- function changeLayer(t, onInput) {
- if (t.layer === "0") {
- t.layer = void 0;
- }
- dispatch10.call("change", this, t, onInput);
- }
- function changeRadio() {
- var t = {};
- var activeKey;
- if (field.key) {
- t[field.key] = void 0;
- }
- radios.each(function(d) {
- var active = select_default2(this).property("checked");
- if (active)
- activeKey = d;
- if (field.key) {
- if (active)
- t[field.key] = d;
- } else {
- var val = _oldType[activeKey] || "yes";
- t[d] = active ? val : void 0;
- }
- });
- if (field.type === "structureRadio") {
- if (activeKey === "bridge") {
- t.layer = "1";
- } else if (activeKey === "tunnel" && t.tunnel !== "building_passage") {
- t.layer = "-1";
- } else {
- t.layer = void 0;
+ if (type2 === _dateFilters[1]) {
+ _toDate = val;
+ if (_fromDate && _toDate && new Date(_toDate) < new Date(_fromDate)) {
+ _fromDate = _toDate;
}
}
- dispatch10.call("change", this, t);
- }
- radio.tags = function(tags) {
- function isOptionChecked(d) {
- if (field.key) {
- return tags[field.key] === d;
+ dispatch14.call("change", this);
+ if (updateUrl) {
+ var rangeString;
+ if (_fromDate || _toDate) {
+ rangeString = (_fromDate || "") + "_" + (_toDate || "");
}
- return !!(typeof tags[d] === "string" && tags[d].toLowerCase() !== "no");
+ setUrlFilterValue("photo_dates", rangeString);
}
- function isMixed(d) {
- if (field.key) {
- return Array.isArray(tags[field.key]) && tags[field.key].includes(d);
+ };
+ photos.setUsernameFilter = function(val, updateUrl) {
+ if (val && typeof val === "string") val = val.replace(/;/g, ",").split(",");
+ if (val) {
+ val = val.map((d2) => d2.trim()).filter(Boolean);
+ if (!val.length) {
+ val = null;
}
- return Array.isArray(tags[d]);
}
- radios.property("checked", function(d) {
- return isOptionChecked(d) && (field.key || field.options.filter(isOptionChecked).length === 1);
- });
- labels.classed("active", function(d) {
- if (field.key) {
- return Array.isArray(tags[field.key]) && tags[field.key].includes(d) || tags[field.key] === d;
+ _usernames = val;
+ dispatch14.call("change", this);
+ if (updateUrl) {
+ var hashString;
+ if (_usernames) {
+ hashString = _usernames.join(",");
}
- return Array.isArray(tags[d]) && tags[d].some((v) => typeof v === "string" && v.toLowerCase() !== "no") || !!(typeof tags[d] === "string" && tags[d].toLowerCase() !== "no");
- }).classed("mixed", isMixed).attr("title", function(d) {
- return isMixed(d) ? _t("inspector.unshared_value_tooltip") : null;
- });
- var selection2 = radios.filter(function() {
- return this.checked;
- });
- if (selection2.empty()) {
- placeholder.text("");
- placeholder.call(_t.append("inspector.none"));
- } else {
- placeholder.text(selection2.attr("value"));
- _oldType[selection2.datum()] = tags[selection2.datum()];
+ setUrlFilterValue("photo_username", hashString);
}
- if (field.type === "structureRadio") {
- if (!!tags.waterway && !_oldType.tunnel) {
- _oldType.tunnel = "culvert";
+ };
+ function setUrlFilterValue(property, val) {
+ if (!window.mocha) {
+ var hash2 = utilStringQs(window.location.hash);
+ if (val) {
+ if (hash2[property] === val) return;
+ hash2[property] = val;
+ } else {
+ if (!(property in hash2)) return;
+ delete hash2[property];
}
- wrap2.call(structureExtras, tags);
+ window.location.replace("#" + utilQsString(hash2, true));
}
+ }
+ function showsLayer(id2) {
+ var layer = context.layers().layer(id2);
+ return layer && layer.supported() && layer.enabled();
+ }
+ photos.shouldFilterByDate = function() {
+ return showsLayer("mapillary") || showsLayer("kartaview") || showsLayer("streetside") || showsLayer("vegbilder") || showsLayer("panoramax");
};
- radio.focus = function() {
- radios.node().focus();
+ photos.shouldFilterByPhotoType = function() {
+ return showsLayer("mapillary") || showsLayer("streetside") && showsLayer("kartaview") || showsLayer("vegbilder") || showsLayer("panoramax");
};
- radio.entityIDs = function(val) {
- if (!arguments.length)
- return _entityIDs;
- _entityIDs = val;
- _oldType = {};
- return radio;
+ photos.shouldFilterByUsername = function() {
+ return !showsLayer("mapillary") && showsLayer("kartaview") && !showsLayer("streetside") || showsLayer("panoramax");
};
- radio.isAllowed = function() {
- return _entityIDs.length === 1;
+ photos.showsPhotoType = function(val) {
+ if (!photos.shouldFilterByPhotoType()) return true;
+ return _shownPhotoTypes.indexOf(val) !== -1;
};
- return utilRebind(radio, dispatch10, "on");
- }
-
- // modules/ui/fields/restrictions.js
- function uiFieldRestrictions(field, context) {
- var dispatch10 = dispatch_default("change");
- var breathe = behaviorBreathe(context);
- corePreferences("turn-restriction-via-way", null);
- var storedViaWay = corePreferences("turn-restriction-via-way0");
- var storedDistance = corePreferences("turn-restriction-distance");
- var _maxViaWay = storedViaWay !== null ? +storedViaWay : 0;
- var _maxDistance = storedDistance ? +storedDistance : 30;
- var _initialized2 = false;
- var _parent = select_default2(null);
- var _container = select_default2(null);
- var _oldTurns;
- var _graph;
- var _vertexID;
- var _intersection;
- var _fromWayID;
- var _lastXPos;
- function restrictions(selection2) {
- _parent = selection2;
- if (_vertexID && (context.graph() !== _graph || !_intersection)) {
- _graph = context.graph();
- _intersection = osmIntersection(_graph, _vertexID, _maxDistance);
+ photos.showsFlat = function() {
+ return photos.showsPhotoType("flat");
+ };
+ photos.showsPanoramic = function() {
+ return photos.showsPhotoType("panoramic");
+ };
+ photos.fromDate = function() {
+ return _fromDate;
+ };
+ photos.toDate = function() {
+ return _toDate;
+ };
+ photos.togglePhotoType = function(val) {
+ var index = _shownPhotoTypes.indexOf(val);
+ if (index !== -1) {
+ _shownPhotoTypes.splice(index, 1);
+ } else {
+ _shownPhotoTypes.push(val);
}
- var isOK = _intersection && _intersection.vertices.length && _intersection.vertices.filter(function(vertex) {
- return vertex.id === _vertexID;
- }).length && _intersection.ways.length > 2 && _intersection.ways.filter(function(way) {
- return way.__to;
- }).length > 1;
- select_default2(selection2.node().parentNode).classed("hide", !isOK);
- if (!isOK || !context.container().select(".inspector-wrap.inspector-hidden").empty() || !selection2.node().parentNode || !selection2.node().parentNode.parentNode) {
- selection2.call(restrictions.off);
- return;
+ dispatch14.call("change", this);
+ return photos;
+ };
+ photos.usernames = function() {
+ return _usernames;
+ };
+ photos.init = function() {
+ var hash2 = utilStringQs(window.location.hash);
+ if (hash2.photo_dates) {
+ var parts = /^(.*)[â_](.*)$/g.exec(hash2.photo_dates.trim());
+ this.setDateFilter("fromDate", parts && parts.length >= 2 && parts[1], false);
+ this.setDateFilter("toDate", parts && parts.length >= 3 && parts[2], false);
}
- var wrap2 = selection2.selectAll(".form-field-input-wrap").data([0]);
- wrap2 = wrap2.enter().append("div").attr("class", "form-field-input-wrap form-field-input-" + field.type).merge(wrap2);
- var container = wrap2.selectAll(".restriction-container").data([0]);
- var containerEnter = container.enter().append("div").attr("class", "restriction-container");
- containerEnter.append("div").attr("class", "restriction-help");
- _container = containerEnter.merge(container).call(renderViewer);
- var controls = wrap2.selectAll(".restriction-controls").data([0]);
- controls.enter().append("div").attr("class", "restriction-controls-container").append("div").attr("class", "restriction-controls").merge(controls).call(renderControls);
- }
- function renderControls(selection2) {
- var distControl = selection2.selectAll(".restriction-distance").data([0]);
- distControl.exit().remove();
- var distControlEnter = distControl.enter().append("div").attr("class", "restriction-control restriction-distance");
- distControlEnter.append("span").attr("class", "restriction-control-label restriction-distance-label").call(_t.append("restriction.controls.distance", { suffix: ":" }));
- distControlEnter.append("input").attr("class", "restriction-distance-input").attr("type", "range").attr("min", "20").attr("max", "50").attr("step", "5");
- distControlEnter.append("span").attr("class", "restriction-distance-text");
- selection2.selectAll(".restriction-distance-input").property("value", _maxDistance).on("input", function() {
- var val = select_default2(this).property("value");
- _maxDistance = +val;
- _intersection = null;
- _container.selectAll(".layer-osm .layer-turns *").remove();
- corePreferences("turn-restriction-distance", _maxDistance);
- _parent.call(restrictions);
- });
- selection2.selectAll(".restriction-distance-text").call(displayMaxDistance(_maxDistance));
- var viaControl = selection2.selectAll(".restriction-via-way").data([0]);
- viaControl.exit().remove();
- var viaControlEnter = viaControl.enter().append("div").attr("class", "restriction-control restriction-via-way");
- viaControlEnter.append("span").attr("class", "restriction-control-label restriction-via-way-label").call(_t.append("restriction.controls.via", { suffix: ":" }));
- viaControlEnter.append("input").attr("class", "restriction-via-way-input").attr("type", "range").attr("min", "0").attr("max", "2").attr("step", "1");
- viaControlEnter.append("span").attr("class", "restriction-via-way-text");
- selection2.selectAll(".restriction-via-way-input").property("value", _maxViaWay).on("input", function() {
- var val = select_default2(this).property("value");
- _maxViaWay = +val;
- _container.selectAll(".layer-osm .layer-turns *").remove();
- corePreferences("turn-restriction-via-way0", _maxViaWay);
- _parent.call(restrictions);
- });
- selection2.selectAll(".restriction-via-way-text").call(displayMaxVia(_maxViaWay));
- }
- function renderViewer(selection2) {
- if (!_intersection)
- return;
- var vgraph = _intersection.graph;
- var filter2 = utilFunctor(true);
- var projection2 = geoRawMercator();
- var sdims = utilGetDimensions(context.container().select(".sidebar"));
- var d = [sdims[0] - 50, 370];
- var c = geoVecScale(d, 0.5);
- var z = 22;
- projection2.scale(geoZoomToScale(z));
- var extent = geoExtent();
- for (var i2 = 0; i2 < _intersection.vertices.length; i2++) {
- extent._extend(_intersection.vertices[i2].extent());
+ if (hash2.photo_username) {
+ this.setUsernameFilter(hash2.photo_username, false);
}
- var padTop = 35;
- if (_intersection.vertices.length > 1) {
- var hPadding = Math.min(160, Math.max(110, d[0] * 0.4));
- var vPadding = 160;
- var tl = projection2([extent[0][0], extent[1][1]]);
- var br = projection2([extent[1][0], extent[0][1]]);
- var hFactor = (br[0] - tl[0]) / (d[0] - hPadding);
- var vFactor = (br[1] - tl[1]) / (d[1] - vPadding - padTop);
- var hZoomDiff = Math.log(Math.abs(hFactor)) / Math.LN2;
- var vZoomDiff = Math.log(Math.abs(vFactor)) / Math.LN2;
- z = z - Math.max(hZoomDiff, vZoomDiff);
- projection2.scale(geoZoomToScale(z));
+ if (hash2.photo_overlay) {
+ var hashOverlayIDs = hash2.photo_overlay.replace(/;/g, ",").split(",");
+ hashOverlayIDs.forEach(function(id2) {
+ if (id2 === "openstreetcam") id2 = "kartaview";
+ var layer2 = _layerIDs.indexOf(id2) !== -1 && context.layers().layer(id2);
+ if (layer2 && !layer2.enabled()) layer2.enabled(true);
+ });
+ }
+ if (hash2.photo) {
+ var photoIds = hash2.photo.replace(/;/g, ",").split(",");
+ var photoId = photoIds.length && photoIds[0].trim();
+ var results = /(.*)\/(.*)/g.exec(photoId);
+ if (results && results.length >= 3) {
+ var serviceId = results[1];
+ if (serviceId === "openstreetcam") serviceId = "kartaview";
+ var photoKey = results[2];
+ var service = services[serviceId];
+ if (service && service.ensureViewerLoaded) {
+ var layer = _layerIDs.indexOf(serviceId) !== -1 && context.layers().layer(serviceId);
+ if (layer && !layer.enabled()) layer.enabled(true);
+ var baselineTime = Date.now();
+ service.on("loadedImages.rendererPhotos", function() {
+ if (Date.now() - baselineTime > 45e3) {
+ service.on("loadedImages.rendererPhotos", null);
+ return;
+ }
+ if (!service.cachedImage(photoKey)) return;
+ service.on("loadedImages.rendererPhotos", null);
+ service.ensureViewerLoaded(context).then(function() {
+ service.selectImage(context, photoKey).showViewer(context);
+ });
+ });
+ }
+ }
+ }
+ context.layers().on("change.rendererPhotos", updateStorage);
+ };
+ return utilRebind(photos, dispatch14, "on");
+ }
+
+ // modules/ui/map_in_map.js
+ function uiMapInMap(context) {
+ function mapInMap(selection2) {
+ var backgroundLayer = rendererTileLayer(context).underzoom(2);
+ 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;
}
- var extentCenter = projection2(extent.center());
- extentCenter[1] = extentCenter[1] - padTop / 2;
- projection2.translate(geoVecSubtract(c, extentCenter)).clipExtent([[0, 0], d]);
- var drawLayers = svgLayers(projection2, context).only(["osm", "touch"]).dimensions(d);
- var drawVertices = svgVertices(projection2, context);
- var drawLines = svgLines(projection2, context);
- var drawTurns = svgTurns(projection2, context);
- var firstTime = selection2.selectAll(".surface").empty();
- selection2.call(drawLayers);
- var surface = selection2.selectAll(".surface").classed("tr", true);
- if (firstTime) {
- _initialized2 = true;
- surface.call(breathe);
+ function zoomed(d3_event) {
+ if (_skipEvents) return;
+ var x2 = d3_event.transform.x;
+ var y2 = d3_event.transform.y;
+ var k2 = d3_event.transform.k;
+ var isZooming = k2 !== _tStart.k;
+ var isPanning = x2 !== _tStart.x || y2 !== _tStart.y;
+ if (!isZooming && !isPanning) {
+ return;
+ }
+ if (!_gesture) {
+ _gesture = isZooming ? "zoom" : "pan";
+ }
+ var tMini = projection2.transform();
+ var tX, tY, scale;
+ if (_gesture === "zoom") {
+ scale = k2 / tMini.k;
+ tX = (_cMini[0] / scale - _cMini[0]) * scale;
+ tY = (_cMini[1] / scale - _cMini[1]) * scale;
+ } else {
+ k2 = tMini.k;
+ scale = 1;
+ tX = x2 - tMini.x;
+ tY = y2 - tMini.y;
+ }
+ utilSetTransform(tiles, tX, tY, scale);
+ utilSetTransform(viewport, 0, 0, scale);
+ _isTransformed = true;
+ _tCurr = identity2.translate(x2, y2).scale(k2);
+ var zMain = geoScaleToZoom(context.projection.scale());
+ var zMini = geoScaleToZoom(k2);
+ _zDiff = zMain - zMini;
+ queueRedraw();
}
- if (_fromWayID && !vgraph.hasEntity(_fromWayID)) {
- _fromWayID = null;
- _oldTurns = null;
+ function zoomEnded() {
+ if (_skipEvents) return;
+ if (_gesture !== "pan") return;
+ updateProjection();
+ _gesture = null;
+ context.map().center(projection2.invert(_cMini));
}
- surface.call(utilSetDimensions, d).call(drawVertices, vgraph, _intersection.vertices, filter2, extent, z).call(drawLines, vgraph, _intersection.ways, filter2).call(drawTurns, vgraph, _intersection.turns(_fromWayID, _maxViaWay));
- surface.on("click.restrictions", click).on("mouseover.restrictions", mouseover);
- surface.selectAll(".selected").classed("selected", false);
- surface.selectAll(".related").classed("related", false);
- var way;
- if (_fromWayID) {
- way = vgraph.entity(_fromWayID);
- surface.selectAll("." + _fromWayID).classed("selected", true).classed("related", true);
+ function updateProjection() {
+ var loc = context.map().center();
+ var tMain = context.projection.transform();
+ var zMain = geoScaleToZoom(tMain.k);
+ var zMini = Math.max(zMain - _zDiff, 0.5);
+ var kMini = geoZoomToScale(zMini);
+ projection2.translate([tMain.x, tMain.y]).scale(kMini);
+ var point = projection2(loc);
+ var mouse = _gesture === "pan" ? geoVecSubtract([_tCurr.x, _tCurr.y], [_tStart.x, _tStart.y]) : [0, 0];
+ var xMini = _cMini[0] - point[0] + tMain.x + mouse[0];
+ var yMini = _cMini[1] - point[1] + tMain.y + mouse[1];
+ projection2.translate([xMini, yMini]).clipExtent([[0, 0], _dMini]);
+ _tCurr = projection2.transform();
+ if (_isTransformed) {
+ utilSetTransform(tiles, 0, 0);
+ utilSetTransform(viewport, 0, 0);
+ _isTransformed = false;
+ }
+ zoom.scaleExtent([geoZoomToScale(0.5), geoZoomToScale(zMain - 3)]);
+ _skipEvents = true;
+ wrap2.call(zoom.transform, _tCurr);
+ _skipEvents = false;
}
- document.addEventListener("resizeWindow", function() {
- utilSetDimensions(_container, null);
- redraw(1);
- }, false);
- updateHints(null);
- function click(d3_event) {
- surface.call(breathe.off).call(breathe);
- var datum2 = d3_event.target.__data__;
- var entity = datum2 && datum2.properties && datum2.properties.entity;
- if (entity) {
- datum2 = entity;
+ function redraw() {
+ clearTimeout(_timeoutID);
+ if (_isHidden) return;
+ updateProjection();
+ var zMini = geoScaleToZoom(projection2.scale());
+ tiles = wrap2.selectAll(".map-in-map-tiles").data([0]);
+ tiles = tiles.enter().append("div").attr("class", "map-in-map-tiles").merge(tiles);
+ backgroundLayer.source(context.background().baseLayerSource()).projection(projection2).dimensions(_dMini);
+ var background = tiles.selectAll(".map-in-map-background").data([0]);
+ background.enter().append("div").attr("class", "map-in-map-background").merge(background).call(backgroundLayer);
+ var overlaySources = context.background().overlayLayerSources();
+ var activeOverlayLayers = [];
+ for (var i3 = 0; i3 < overlaySources.length; i3++) {
+ if (overlaySources[i3].validZoom(zMini)) {
+ if (!overlayLayers[i3]) overlayLayers[i3] = rendererTileLayer(context);
+ activeOverlayLayers.push(overlayLayers[i3].source(overlaySources[i3]).projection(projection2).dimensions(_dMini));
+ }
}
- if (datum2 instanceof osmWay && (datum2.__from || datum2.__via)) {
- _fromWayID = datum2.id;
- _oldTurns = null;
+ var overlay = tiles.selectAll(".map-in-map-overlay").data([0]);
+ overlay = overlay.enter().append("div").attr("class", "map-in-map-overlay").merge(overlay);
+ var overlays = overlay.selectAll("div").data(activeOverlayLayers, function(d2) {
+ return d2.source().name();
+ });
+ overlays.exit().remove();
+ overlays = overlays.enter().append("div").merge(overlays).each(function(layer) {
+ select_default2(this).call(layer);
+ });
+ var dataLayers = tiles.selectAll(".map-in-map-data").data([0]);
+ dataLayers.exit().remove();
+ dataLayers = dataLayers.enter().append("svg").attr("class", "map-in-map-data").merge(dataLayers).call(dataLayer).call(debugLayer);
+ if (_gesture !== "pan") {
+ var getPath = path_default(projection2);
+ var bbox2 = { type: "Polygon", coordinates: [context.map().extent().polygon()] };
+ viewport = wrap2.selectAll(".map-in-map-viewport").data([0]);
+ viewport = viewport.enter().append("svg").attr("class", "map-in-map-viewport").merge(viewport);
+ var path = viewport.selectAll(".map-in-map-bbox").data([bbox2]);
+ path.enter().append("path").attr("class", "map-in-map-bbox").merge(path).attr("d", getPath).classed("thick", function(d2) {
+ return getPath.area(d2) < 30;
+ });
+ }
+ }
+ function queueRedraw() {
+ clearTimeout(_timeoutID);
+ _timeoutID = setTimeout(function() {
redraw();
- } else if (datum2 instanceof osmTurn) {
- var actions, extraActions, turns, i3;
- var restrictionType = osmInferRestriction(vgraph, datum2, projection2);
- if (datum2.restrictionID && !datum2.direct) {
- return;
- } else if (datum2.restrictionID && !datum2.only) {
- var seen = {};
- var datumOnly = JSON.parse(JSON.stringify(datum2));
- datumOnly.only = true;
- restrictionType = restrictionType.replace(/^no/, "only");
- turns = _intersection.turns(_fromWayID, 2);
- extraActions = [];
- _oldTurns = [];
- for (i3 = 0; i3 < turns.length; i3++) {
- var turn = turns[i3];
- if (seen[turn.restrictionID])
- continue;
- if (turn.direct && turn.path[1] === datum2.path[1]) {
- seen[turns[i3].restrictionID] = true;
- turn.restrictionType = osmInferRestriction(vgraph, turn, projection2);
- _oldTurns.push(turn);
- extraActions.push(actionUnrestrictTurn(turn));
- }
- }
- actions = _intersection.actions.concat(extraActions, [
- actionRestrictTurn(datumOnly, restrictionType),
- _t("operations.restriction.annotation.create")
- ]);
- } else if (datum2.restrictionID) {
- turns = _oldTurns || [];
- extraActions = [];
- for (i3 = 0; i3 < turns.length; i3++) {
- if (turns[i3].key !== datum2.key) {
- extraActions.push(actionRestrictTurn(turns[i3], turns[i3].restrictionType));
- }
- }
- _oldTurns = null;
- actions = _intersection.actions.concat(extraActions, [
- actionUnrestrictTurn(datum2),
- _t("operations.restriction.annotation.delete")
- ]);
- } else {
- actions = _intersection.actions.concat([
- actionRestrictTurn(datum2, restrictionType),
- _t("operations.restriction.annotation.create")
- ]);
- }
- context.perform.apply(context, actions);
- var s = surface.selectAll("." + datum2.key);
- datum2 = s.empty() ? null : s.datum();
- updateHints(datum2);
+ }, 750);
+ }
+ function toggle(d3_event) {
+ if (d3_event) d3_event.preventDefault();
+ _isHidden = !_isHidden;
+ context.container().select(".minimap-toggle-item").classed("active", !_isHidden).select("input").property("checked", !_isHidden);
+ if (_isHidden) {
+ wrap2.style("display", "block").style("opacity", "1").transition().duration(200).style("opacity", "0").on("end", function() {
+ selection2.selectAll(".map-in-map").style("display", "none");
+ });
} else {
- _fromWayID = null;
- _oldTurns = null;
- redraw();
+ wrap2.style("display", "block").style("opacity", "0").transition().duration(200).style("opacity", "1").on("end", function() {
+ redraw();
+ });
}
}
- function mouseover(d3_event) {
- var datum2 = d3_event.target.__data__;
- updateHints(datum2);
+ uiMapInMap.toggle = toggle;
+ wrap2 = selection2.selectAll(".map-in-map").data([0]);
+ wrap2 = wrap2.enter().append("div").attr("class", "map-in-map").style("display", _isHidden ? "none" : "block").call(zoom).on("dblclick.zoom", null).merge(wrap2);
+ _dMini = [200, 150];
+ _cMini = geoVecScale(_dMini, 0.5);
+ context.map().on("drawn.map-in-map", function(drawn) {
+ if (drawn.full === true) {
+ redraw();
+ }
+ });
+ redraw();
+ context.keybinding().on(_t("background.minimap.key"), toggle);
+ }
+ return mapInMap;
+ }
+
+ // modules/ui/notice.js
+ function uiNotice(context) {
+ return function(selection2) {
+ var div = selection2.append("div").attr("class", "notice");
+ var button = div.append("button").attr("class", "zoom-to notice fillD").on("click", function() {
+ context.map().zoomEase(context.minEditableZoom());
+ }).on("wheel", function(d3_event) {
+ var e22 = new WheelEvent(d3_event.type, d3_event);
+ context.surface().node().dispatchEvent(e22);
+ });
+ button.call(svgIcon("#iD-icon-plus", "pre-text")).append("span").attr("class", "label").call(_t.append("zoom_in_edit"));
+ function disableTooHigh() {
+ var canEdit = context.map().zoom() >= context.minEditableZoom();
+ div.style("display", canEdit ? "none" : "block");
}
- _lastXPos = _lastXPos || sdims[0];
- function redraw(minChange) {
- var xPos = -1;
- if (minChange) {
- xPos = utilGetDimensions(context.container().select(".sidebar"))[0];
+ context.map().on("move.notice", debounce_default(disableTooHigh, 500));
+ disableTooHigh();
+ };
+ }
+
+ // modules/ui/photoviewer.js
+ function uiPhotoviewer(context) {
+ var dispatch14 = dispatch_default("resize");
+ var _pointerPrefix = "PointerEvent" in window ? "pointer" : "mouse";
+ function photoviewer(selection2) {
+ selection2.append("button").attr("class", "thumb-hide").attr("title", _t("icons.close")).on("click", function() {
+ if (services.streetside) {
+ services.streetside.hideViewer(context);
}
- if (!minChange || minChange && Math.abs(xPos - _lastXPos) >= minChange) {
- if (context.hasEntity(_vertexID)) {
- _lastXPos = xPos;
- _container.call(renderViewer);
- }
+ if (services.mapillary) {
+ services.mapillary.hideViewer(context);
}
- }
- function highlightPathsFrom(wayID) {
- surface.selectAll(".related").classed("related", false).classed("allow", false).classed("restrict", false).classed("only", false);
- surface.selectAll("." + wayID).classed("related", true);
- if (wayID) {
- var turns = _intersection.turns(wayID, _maxViaWay);
- for (var i3 = 0; i3 < turns.length; i3++) {
- var turn = turns[i3];
- var ids = [turn.to.way];
- var klass = turn.no ? "restrict" : turn.only ? "only" : "allow";
- if (turn.only || turns.length === 1) {
- if (turn.via.ways) {
- ids = ids.concat(turn.via.ways);
- }
- } else if (turn.to.way === wayID) {
- continue;
- }
- surface.selectAll(utilEntitySelector(ids)).classed("related", true).classed("allow", klass === "allow").classed("restrict", klass === "restrict").classed("only", klass === "only");
- }
+ if (services.kartaview) {
+ services.kartaview.hideViewer(context);
}
- }
- function updateHints(datum2) {
- var help = _container.selectAll(".restriction-help").html("");
- var placeholders = {};
- ["from", "via", "to"].forEach(function(k) {
- placeholders[k] = { html: '' + _t("restriction.help." + k) + "" };
- });
- var entity = datum2 && datum2.properties && datum2.properties.entity;
- if (entity) {
- datum2 = entity;
+ if (services.mapilio) {
+ services.mapilio.hideViewer(context);
}
- if (_fromWayID) {
- way = vgraph.entity(_fromWayID);
- surface.selectAll("." + _fromWayID).classed("selected", true).classed("related", true);
+ if (services.panoramax) {
+ services.panoramax.hideViewer(context);
}
- if (datum2 instanceof osmWay && datum2.__from) {
- way = datum2;
- highlightPathsFrom(_fromWayID ? null : way.id);
- surface.selectAll("." + way.id).classed("related", true);
- var clickSelect = !_fromWayID || _fromWayID !== way.id;
- help.append("div").html(_t.html("restriction.help." + (clickSelect ? "select_from_name" : "from_name"), {
- from: placeholders.from,
- fromName: displayName(way.id, vgraph)
- }));
- } else if (datum2 instanceof osmTurn) {
- var restrictionType = osmInferRestriction(vgraph, datum2, projection2);
- var turnType = restrictionType.replace(/^(only|no)\_/, "");
- var indirect = datum2.direct === false ? _t.html("restriction.help.indirect") : "";
- var klass, turnText, nextText;
- if (datum2.no) {
- klass = "restrict";
- turnText = _t.html("restriction.help.turn.no_" + turnType, { indirect: { html: indirect } });
- nextText = _t.html("restriction.help.turn.only_" + turnType, { indirect: "" });
- } else if (datum2.only) {
- klass = "only";
- turnText = _t.html("restriction.help.turn.only_" + turnType, { indirect: { html: indirect } });
- nextText = _t.html("restriction.help.turn.allowed_" + turnType, { indirect: "" });
+ if (services.vegbilder) {
+ services.vegbilder.hideViewer(context);
+ }
+ }).append("div").call(svgIcon("#iD-icon-close"));
+ function preventDefault(d3_event) {
+ d3_event.preventDefault();
+ }
+ selection2.append("button").attr("class", "resize-handle-xy").on("touchstart touchdown touchend", preventDefault).on(
+ _pointerPrefix + "down",
+ buildResizeListener(selection2, "resize", dispatch14, { resizeOnX: true, resizeOnY: true })
+ );
+ selection2.append("button").attr("class", "resize-handle-x").on("touchstart touchdown touchend", preventDefault).on(
+ _pointerPrefix + "down",
+ buildResizeListener(selection2, "resize", dispatch14, { resizeOnX: true })
+ );
+ selection2.append("button").attr("class", "resize-handle-y").on("touchstart touchdown touchend", preventDefault).on(
+ _pointerPrefix + "down",
+ buildResizeListener(selection2, "resize", dispatch14, { resizeOnY: true })
+ );
+ context.features().on("change.setPhotoFromViewer", function() {
+ setPhotoFromViewerButton();
+ });
+ context.history().on("change.setPhotoFromViewer", function() {
+ setPhotoFromViewerButton();
+ });
+ function setPhotoFromViewerButton() {
+ if (services.mapillary.isViewerOpen()) {
+ let setMapillaryPhotoId2 = function() {
+ const service = services.mapillary;
+ const image = service.getActiveImage();
+ const action = (graph) => context.selectedIDs().reduce((graph2, entityID) => {
+ const tags = graph2.entity(entityID).tags;
+ const action2 = actionChangeTags(entityID, __spreadProps(__spreadValues({}, tags), { mapillary: image.id }));
+ return action2(graph2);
+ }, graph);
+ const annotation = _t("operations.change_tags.annotation");
+ context.perform(action, annotation);
+ };
+ var setMapillaryPhotoId = setMapillaryPhotoId2;
+ if (context.mode().id !== "select" || !(layerStatus("mapillary") && getServiceId() === "mapillary")) {
+ buttonRemove();
} else {
- klass = "allow";
- turnText = _t.html("restriction.help.turn.allowed_" + turnType, { indirect: { html: indirect } });
- nextText = _t.html("restriction.help.turn.no_" + turnType, { indirect: "" });
- }
- help.append("div").attr("class", "qualifier " + klass).html(turnText);
- help.append("div").html(_t.html("restriction.help.from_name_to_name", {
- from: placeholders.from,
- fromName: displayName(datum2.from.way, vgraph),
- to: placeholders.to,
- toName: displayName(datum2.to.way, vgraph)
- }));
- if (datum2.via.ways && datum2.via.ways.length) {
- var names = [];
- for (var i3 = 0; i3 < datum2.via.ways.length; i3++) {
- var prev = names[names.length - 1];
- var curr = displayName(datum2.via.ways[i3], vgraph);
- if (!prev || curr !== prev) {
- names.push(curr);
- }
+ if (selection2.select(".set-photo-from-viewer").empty()) {
+ const button = buttonCreate();
+ button.on("click", function(e3) {
+ e3.preventDefault();
+ e3.stopPropagation();
+ setMapillaryPhotoId2();
+ buttonDisable("already_set");
+ });
}
- help.append("div").html(_t.html("restriction.help.via_names", {
- via: placeholders.via,
- viaNames: names.join(", ")
- }));
- }
- if (!indirect) {
- help.append("div").html(_t.html("restriction.help.toggle", { turn: { html: nextText.trim() } }));
+ buttonShowHide();
+ }
+ }
+ function layerStatus(which) {
+ const layers = context.layers();
+ const layer = layers.layer(which);
+ return layer.enabled();
+ }
+ function getServiceId() {
+ const hash2 = utilStringQs(window.location.hash);
+ let serviceId;
+ if (hash2.photo) {
+ let result = hash2.photo.split("/");
+ serviceId = result[0];
+ }
+ return serviceId;
+ }
+ function buttonCreate() {
+ const button = selection2.selectAll(".set-photo-from-viewer").data([0]);
+ const buttonEnter = button.enter().append("button").attr("class", "set-photo-from-viewer").call(svgIcon("#iD-icon-plus")).call(
+ uiTooltip().title(() => _t.append("inspector.set_photo_from_viewer.enable")).placement("right")
+ );
+ buttonEnter.select(".tooltip").classed("dark", true).style("width", "300px");
+ return buttonEnter;
+ }
+ function buttonRemove() {
+ const button = selection2.selectAll(".set-photo-from-viewer").data([0]);
+ button.remove();
+ }
+ function buttonShowHide() {
+ const activeImage = services.mapillary.getActiveImage();
+ const graph = context.graph();
+ const entities = context.selectedIDs().map((id2) => graph.entity(id2));
+ if (entities.map((entity) => entity.tags.mapillary).every((value) => value === (activeImage == null ? void 0 : activeImage.id))) {
+ buttonDisable("already_set");
+ } else if (activeImage && entities.map((entity) => entity.extent(context.graph()).center()).every((loc) => geoSphericalDistance(loc, activeImage.loc) > 100)) {
+ buttonDisable("too_far");
+ } else {
+ buttonDisable(false);
}
- highlightPathsFrom(null);
- var alongIDs = datum2.path.slice();
- surface.selectAll(utilEntitySelector(alongIDs)).classed("related", true).classed("allow", klass === "allow").classed("restrict", klass === "restrict").classed("only", klass === "only");
- } else {
- highlightPathsFrom(null);
- if (_fromWayID) {
- help.append("div").html(_t.html("restriction.help.from_name", {
- from: placeholders.from,
- fromName: displayName(_fromWayID, vgraph)
- }));
+ }
+ function buttonDisable(reason) {
+ const disabled = reason !== false;
+ const button = selection2.selectAll(".set-photo-from-viewer").data([0]);
+ button.attr("disabled", disabled ? "true" : null);
+ button.classed("disabled", disabled);
+ button.call(uiTooltip().destroyAny);
+ if (disabled) {
+ button.call(
+ uiTooltip().title(() => _t.append("inspector.set_photo_from_viewer.disable.".concat(reason))).placement("right")
+ );
} else {
- help.append("div").html(_t.html("restriction.help.select_from", {
- from: placeholders.from
- }));
+ button.call(
+ uiTooltip().title(() => _t.append("inspector.set_photo_from_viewer.enable")).placement("right")
+ );
}
+ button.select(".tooltip").classed("dark", true).style("width", "300px");
}
}
- }
- function displayMaxDistance(maxDist) {
- return (selection2) => {
- var isImperial = !_mainLocalizer.usesMetric();
- var opts;
- if (isImperial) {
- var distToFeet = {
- 20: 70,
- 25: 85,
- 30: 100,
- 35: 115,
- 40: 130,
- 45: 145,
- 50: 160
- }[maxDist];
- opts = { distance: _t("units.feet", { quantity: distToFeet }) };
- } else {
- opts = { distance: _t("units.meters", { quantity: maxDist }) };
+ function buildResizeListener(target, eventName, dispatch15, options2) {
+ var resizeOnX = !!options2.resizeOnX;
+ var resizeOnY = !!options2.resizeOnY;
+ var minHeight = options2.minHeight || 240;
+ var minWidth = options2.minWidth || 320;
+ var pointerId;
+ var startX;
+ var startY;
+ var startWidth;
+ var startHeight;
+ function startResize(d3_event) {
+ if (pointerId !== (d3_event.pointerId || "mouse")) return;
+ d3_event.preventDefault();
+ d3_event.stopPropagation();
+ var mapSize = context.map().dimensions();
+ if (resizeOnX) {
+ var mapWidth = mapSize[0];
+ const viewerMargin = parseInt(select_default2(".photoviewer").style("margin-left"), 10);
+ var newWidth = clamp3(startWidth + d3_event.clientX - startX, minWidth, mapWidth - viewerMargin * 2);
+ target.style("width", newWidth + "px");
+ }
+ if (resizeOnY) {
+ const menuHeight = utilGetDimensions(select_default2(".top-toolbar"))[1] + utilGetDimensions(select_default2(".map-footer"))[1];
+ const viewerMargin = parseInt(select_default2(".photoviewer").style("margin-bottom"), 10);
+ var maxHeight = mapSize[1] - menuHeight - viewerMargin * 2;
+ var newHeight = clamp3(startHeight + startY - d3_event.clientY, minHeight, maxHeight);
+ target.style("height", newHeight + "px");
+ }
+ dispatch15.call(eventName, target, subtractPadding(utilGetDimensions(target, true), target));
}
- return selection2.html("").call(_t.append("restriction.controls.distance_up_to", opts));
- };
- }
- function displayMaxVia(maxVia) {
- return (selection2) => {
- selection2 = selection2.html("");
- return maxVia === 0 ? selection2.call(_t.append("restriction.controls.via_node_only")) : maxVia === 1 ? selection2.call(_t.append("restriction.controls.via_up_to_one")) : selection2.call(_t.append("restriction.controls.via_up_to_two"));
- };
- }
- function displayName(entityID, graph) {
- var entity = graph.entity(entityID);
- var name2 = utilDisplayName(entity) || "";
- var matched = _mainPresetIndex.match(entity, graph);
- var type3 = matched && matched.name() || utilDisplayType(entity.id);
- return name2 || type3;
+ function clamp3(num, min3, max3) {
+ return Math.max(min3, Math.min(num, max3));
+ }
+ function stopResize(d3_event) {
+ if (pointerId !== (d3_event.pointerId || "mouse")) return;
+ d3_event.preventDefault();
+ d3_event.stopPropagation();
+ select_default2(window).on("." + eventName, null);
+ }
+ return function initResize(d3_event) {
+ d3_event.preventDefault();
+ d3_event.stopPropagation();
+ pointerId = d3_event.pointerId || "mouse";
+ startX = d3_event.clientX;
+ startY = d3_event.clientY;
+ var targetRect = target.node().getBoundingClientRect();
+ startWidth = targetRect.width;
+ startHeight = targetRect.height;
+ select_default2(window).on(_pointerPrefix + "move." + eventName, startResize, false).on(_pointerPrefix + "up." + eventName, stopResize, false);
+ if (_pointerPrefix === "pointer") {
+ select_default2(window).on("pointercancel." + eventName, stopResize, false);
+ }
+ };
+ }
}
- restrictions.entityIDs = function(val) {
- _intersection = null;
- _fromWayID = null;
- _oldTurns = null;
- _vertexID = val[0];
- };
- restrictions.tags = function() {
- };
- restrictions.focus = function() {
+ photoviewer.onMapResize = function() {
+ var photoviewer2 = context.container().select(".photoviewer");
+ var content = context.container().select(".main-content");
+ var mapDimensions = utilGetDimensions(content, true);
+ const menuHeight = utilGetDimensions(select_default2(".top-toolbar"))[1] + utilGetDimensions(select_default2(".map-footer"))[1];
+ const viewerMargin = parseInt(select_default2(".photoviewer").style("margin-bottom"), 10);
+ var photoDimensions = utilGetDimensions(photoviewer2, true);
+ if (photoDimensions[0] > mapDimensions[0] || photoDimensions[1] > mapDimensions[1] - menuHeight - viewerMargin * 2) {
+ var setPhotoDimensions = [
+ Math.min(photoDimensions[0], mapDimensions[0]),
+ Math.min(photoDimensions[1], mapDimensions[1] - menuHeight - viewerMargin * 2)
+ ];
+ photoviewer2.style("width", setPhotoDimensions[0] + "px").style("height", setPhotoDimensions[1] + "px");
+ dispatch14.call("resize", photoviewer2, subtractPadding(setPhotoDimensions, photoviewer2));
+ }
};
- restrictions.off = function(selection2) {
- if (!_initialized2)
- return;
- selection2.selectAll(".surface").call(breathe.off).on("click.restrictions", null).on("mouseover.restrictions", null);
- select_default2(window).on("resize.restrictions", null);
+ function subtractPadding(dimensions, selection2) {
+ return [
+ dimensions[0] - parseFloat(selection2.style("padding-left")) - parseFloat(selection2.style("padding-right")),
+ dimensions[1] - parseFloat(selection2.style("padding-top")) - parseFloat(selection2.style("padding-bottom"))
+ ];
+ }
+ return utilRebind(photoviewer, dispatch14, "on");
+ }
+
+ // modules/ui/restore.js
+ function uiRestore(context) {
+ return function(selection2) {
+ if (!context.history().hasRestorableChanges()) return;
+ let modalSelection = uiModal(selection2, true);
+ modalSelection.select(".modal").attr("class", "modal fillL");
+ let introModal = modalSelection.select(".content");
+ introModal.append("div").attr("class", "modal-section").append("h3").call(_t.append("restore.heading"));
+ introModal.append("div").attr("class", "modal-section").append("p").call(_t.append("restore.description"));
+ let buttonWrap = introModal.append("div").attr("class", "modal-actions");
+ let restore = buttonWrap.append("button").attr("class", "restore").on("click", () => {
+ context.history().restore();
+ modalSelection.remove();
+ });
+ restore.append("svg").attr("class", "logo logo-restore").append("use").attr("xlink:href", "#iD-logo-restore");
+ restore.append("div").call(_t.append("restore.restore"));
+ let reset = buttonWrap.append("button").attr("class", "reset").on("click", () => {
+ context.history().clearSaved();
+ modalSelection.remove();
+ });
+ reset.append("svg").attr("class", "logo logo-reset").append("use").attr("xlink:href", "#iD-logo-reset");
+ reset.append("div").call(_t.append("restore.reset"));
+ restore.node().focus();
};
- return utilRebind(restrictions, dispatch10, "on");
}
- uiFieldRestrictions.supportsMultiselection = false;
- // modules/ui/fields/textarea.js
- function uiFieldTextarea(field, context) {
- var dispatch10 = dispatch_default("change");
- var input = select_default2(null);
- var _tags;
- function textarea(selection2) {
- var wrap2 = selection2.selectAll(".form-field-input-wrap").data([0]);
- wrap2 = wrap2.enter().append("div").attr("class", "form-field-input-wrap form-field-input-" + field.type).merge(wrap2);
- input = wrap2.selectAll("textarea").data([0]);
- input = input.enter().append("textarea").attr("id", field.domId).call(utilNoAuto).on("input", change(true)).on("blur", change()).on("change", change()).merge(input);
+ // modules/ui/scale.js
+ function uiScale(context) {
+ var projection2 = context.projection, isImperial = !_mainLocalizer.usesMetric(), maxLength = 180, tickHeight = 8;
+ function scaleDefs(loc1, loc2) {
+ var lat = (loc2[1] + loc1[1]) / 2, conversion = isImperial ? 3.28084 : 1, dist = geoLonToMeters(loc2[0] - loc1[0], lat) * conversion, scale = { dist: 0, px: 0, text: "" }, buckets, i3, val, dLon;
+ if (isImperial) {
+ buckets = [528e4, 528e3, 52800, 5280, 500, 50, 5, 1];
+ } else {
+ buckets = [5e6, 5e5, 5e4, 5e3, 500, 50, 5, 1];
+ }
+ for (i3 = 0; i3 < buckets.length; i3++) {
+ val = buckets[i3];
+ if (dist >= val) {
+ scale.dist = Math.floor(dist / val) * val;
+ break;
+ } else {
+ scale.dist = +dist.toFixed(2);
+ }
+ }
+ dLon = geoMetersToLon(scale.dist / conversion, lat);
+ scale.px = Math.round(projection2([loc1[0] + dLon, loc1[1]])[0]);
+ scale.text = displayLength(scale.dist / conversion, isImperial);
+ return scale;
}
- function change(onInput) {
- return function() {
- var val = utilGetSetValue(input);
- if (!onInput)
- val = context.cleanTagValue(val);
- if (!val && Array.isArray(_tags[field.key]))
- return;
- var t = {};
- t[field.key] = val || void 0;
- dispatch10.call("change", this, t, onInput);
- };
+ function update(selection2) {
+ var dims = context.map().dimensions(), loc1 = projection2.invert([0, dims[1]]), loc2 = projection2.invert([maxLength, dims[1]]), scale = scaleDefs(loc1, loc2);
+ selection2.select(".scale-path").attr("d", "M0.5,0.5v" + tickHeight + "h" + scale.px + "v-" + tickHeight);
+ selection2.select(".scale-text").style(_mainLocalizer.textDirection() === "ltr" ? "left" : "right", scale.px + 16 + "px").text(scale.text);
}
- textarea.tags = function(tags) {
- _tags = tags;
- var isMixed = Array.isArray(tags[field.key]);
- utilGetSetValue(input, !isMixed && tags[field.key] ? tags[field.key] : "").attr("title", isMixed ? tags[field.key].filter(Boolean).join("\n") : void 0).attr("placeholder", isMixed ? _t("inspector.multiple_values") : field.placeholder() || _t("inspector.unknown")).classed("mixed", isMixed);
- };
- textarea.focus = function() {
- input.node().focus();
+ return function(selection2) {
+ function switchUnits() {
+ isImperial = !isImperial;
+ selection2.call(update);
+ }
+ var scalegroup = selection2.append("svg").attr("class", "scale").on("click", switchUnits).append("g").attr("transform", "translate(10,11)");
+ scalegroup.append("path").attr("class", "scale-path");
+ selection2.append("div").attr("class", "scale-text");
+ selection2.call(update);
+ context.map().on("move.scale", function() {
+ update(selection2);
+ });
};
- return utilRebind(textarea, dispatch10, "on");
}
- // modules/ui/fields/wikidata.js
- function uiFieldWikidata(field, context) {
- var wikidata = services.wikidata;
- var dispatch10 = dispatch_default("change");
+ // modules/ui/shortcuts.js
+ function uiShortcuts(context) {
+ var detected = utilDetect();
+ var _activeTab = 0;
+ var _modalSelection;
var _selection = select_default2(null);
- var _searchInput = select_default2(null);
- var _qid = null;
- var _wikidataEntity = null;
- var _wikiURL = "";
- var _entityIDs = [];
- var _wikipediaKey = field.keys && field.keys.find(function(key) {
- return key.includes("wikipedia");
- }), _hintKey = field.key === "wikidata" ? "name" : field.key.split(":")[0];
- var combobox = uiCombobox(context, "combo-" + field.safeid).caseSensitive(true).minItems(1);
- function wiki(selection2) {
- _selection = selection2;
- var wrap2 = selection2.selectAll(".form-field-input-wrap").data([0]);
- wrap2 = wrap2.enter().append("div").attr("class", "form-field-input-wrap form-field-input-" + field.type).merge(wrap2);
- var list = wrap2.selectAll("ul").data([0]);
- list = list.enter().append("ul").attr("class", "rows").merge(list);
- var searchRow = list.selectAll("li.wikidata-search").data([0]);
- var searchRowEnter = searchRow.enter().append("li").attr("class", "wikidata-search");
- searchRowEnter.append("input").attr("type", "text").attr("id", field.domId).style("flex", "1").call(utilNoAuto).on("focus", function() {
- var node = select_default2(this).node();
- node.setSelectionRange(0, node.value.length);
- }).on("blur", function() {
- setLabelForEntity();
- }).call(combobox.fetcher(fetchWikidataItems));
- combobox.on("accept", function(d) {
- if (d) {
- _qid = d.id;
- change();
- }
- }).on("cancel", function() {
- setLabelForEntity();
+ var _dataShortcuts;
+ function shortcutsModal(_modalSelection2) {
+ _modalSelection2.select(".modal").classed("modal-shortcuts", true);
+ var content = _modalSelection2.select(".content");
+ content.append("div").attr("class", "modal-section header").append("h2").call(_t.append("shortcuts.title"));
+ _mainFileFetcher.get("shortcuts").then(function(data) {
+ _dataShortcuts = data;
+ content.call(render);
+ }).catch(function() {
});
- searchRowEnter.append("button").attr("class", "form-field-button wiki-link").attr("title", _t("icons.view_on", { domain: "wikidata.org" })).call(svgIcon("#iD-icon-out-link")).on("click", function(d3_event) {
+ }
+ function render(selection2) {
+ if (!_dataShortcuts) return;
+ var wrapper = selection2.selectAll(".wrapper").data([0]);
+ var wrapperEnter = wrapper.enter().append("div").attr("class", "wrapper modal-section");
+ var tabsBar = wrapperEnter.append("div").attr("class", "tabs-bar");
+ var shortcutsList = wrapperEnter.append("div").attr("class", "shortcuts-list");
+ wrapper = wrapper.merge(wrapperEnter);
+ var tabs = tabsBar.selectAll(".tab").data(_dataShortcuts);
+ var tabsEnter = tabs.enter().append("a").attr("class", "tab").attr("href", "#").on("click", function(d3_event, d2) {
d3_event.preventDefault();
- if (_wikiURL)
- window.open(_wikiURL, "_blank");
+ var i3 = _dataShortcuts.indexOf(d2);
+ _activeTab = i3;
+ render(selection2);
});
- searchRow = searchRow.merge(searchRowEnter);
- _searchInput = searchRow.select("input");
- var wikidataProperties = ["description", "identifier"];
- var items = list.selectAll("li.labeled-input").data(wikidataProperties);
- var enter = items.enter().append("li").attr("class", function(d) {
- return "labeled-input preset-wikidata-" + d;
+ tabsEnter.append("span").html(function(d2) {
+ return _t.html(d2.text);
});
- enter.append("span").attr("class", "label").html(function(d) {
- return _t.html("wikidata." + d);
+ wrapper.selectAll(".tab").classed("active", function(d2, i3) {
+ return i3 === _activeTab;
});
- enter.append("input").attr("type", "text").call(utilNoAuto).classed("disabled", "true").attr("readonly", "true");
- enter.append("button").attr("class", "form-field-button").attr("title", _t("icons.copy")).call(svgIcon("#iD-operation-copy")).on("click", function(d3_event) {
- d3_event.preventDefault();
- select_default2(this.parentNode).select("input").node().select();
- document.execCommand("copy");
+ var shortcuts = shortcutsList.selectAll(".shortcut-tab").data(_dataShortcuts);
+ var shortcutsEnter = shortcuts.enter().append("div").attr("class", function(d2) {
+ return "shortcut-tab shortcut-tab-" + d2.tab;
});
- }
- function fetchWikidataItems(q, callback) {
- if (!q && _hintKey) {
- for (var i2 in _entityIDs) {
- var entity = context.hasEntity(_entityIDs[i2]);
- if (entity.tags[_hintKey]) {
- q = entity.tags[_hintKey];
- break;
- }
- }
- }
- wikidata.itemsForSearchQuery(q, function(err, data) {
- if (err)
- return;
- for (var i3 in data) {
- data[i3].value = data[i3].label + " (" + data[i3].id + ")";
- data[i3].title = data[i3].description;
+ var columnsEnter = shortcutsEnter.selectAll(".shortcut-column").data(function(d2) {
+ return d2.columns;
+ }).enter().append("table").attr("class", "shortcut-column");
+ var rowsEnter = columnsEnter.selectAll(".shortcut-row").data(function(d2) {
+ return d2.rows;
+ }).enter().append("tr").attr("class", "shortcut-row");
+ var sectionRows = rowsEnter.filter(function(d2) {
+ return !d2.shortcuts;
+ });
+ sectionRows.append("td");
+ sectionRows.append("td").attr("class", "shortcut-section").append("h3").html(function(d2) {
+ return _t.html(d2.text);
+ });
+ var shortcutRows = rowsEnter.filter(function(d2) {
+ return d2.shortcuts;
+ });
+ var shortcutKeys = shortcutRows.append("td").attr("class", "shortcut-keys");
+ var modifierKeys = shortcutKeys.filter(function(d2) {
+ return d2.modifiers;
+ });
+ modifierKeys.selectAll("kbd.modifier").data(function(d2) {
+ if (detected.os === "win" && d2.text === "shortcuts.editing.commands.redo") {
+ return ["\u2318"];
+ } else if (detected.os !== "mac" && d2.text === "shortcuts.browsing.display_options.fullscreen") {
+ return [];
+ } else {
+ return d2.modifiers;
}
- if (callback)
- callback(data);
+ }).enter().each(function() {
+ var selection3 = select_default2(this);
+ selection3.append("kbd").attr("class", "modifier").text(function(d2) {
+ return uiCmd.display(d2);
+ });
+ selection3.append("span").text("+");
});
- }
- function change() {
- var syncTags = {};
- syncTags[field.key] = _qid;
- dispatch10.call("change", this, syncTags);
- var initGraph = context.graph();
- var initEntityIDs = _entityIDs;
- wikidata.entityByQID(_qid, function(err, entity) {
- if (err)
- return;
- if (context.graph() !== initGraph)
- return;
- if (!entity.sitelinks)
- return;
- var langs = wikidata.languagesToQuery();
- ["labels", "descriptions"].forEach(function(key) {
- if (!entity[key])
- return;
- var valueLangs = Object.keys(entity[key]);
- if (valueLangs.length === 0)
- return;
- var valueLang = valueLangs[0];
- if (langs.indexOf(valueLang) === -1) {
- langs.push(valueLang);
- }
+ shortcutKeys.selectAll("kbd.shortcut").data(function(d2) {
+ var arr = d2.shortcuts;
+ if (detected.os === "win" && d2.text === "shortcuts.editing.commands.redo") {
+ arr = ["Y"];
+ } else if (detected.os !== "mac" && d2.text === "shortcuts.browsing.display_options.fullscreen") {
+ arr = ["F11"];
+ }
+ arr = arr.map(function(s2) {
+ return uiCmd.display(s2.indexOf(".") !== -1 ? _t(s2) : s2);
});
- var newWikipediaValue;
- if (_wikipediaKey) {
- var foundPreferred;
- for (var i2 in langs) {
- var lang = langs[i2];
- var siteID = lang.replace("-", "_") + "wiki";
- if (entity.sitelinks[siteID]) {
- foundPreferred = true;
- newWikipediaValue = lang + ":" + entity.sitelinks[siteID].title;
- break;
- }
- }
- if (!foundPreferred) {
- var wikiSiteKeys = Object.keys(entity.sitelinks).filter(function(site) {
- return site.endsWith("wiki");
- });
- if (wikiSiteKeys.length === 0) {
- newWikipediaValue = null;
- } else {
- var wikiLang = wikiSiteKeys[0].slice(0, -4).replace("_", "-");
- var wikiTitle = entity.sitelinks[wikiSiteKeys[0]].title;
- newWikipediaValue = wikiLang + ":" + wikiTitle;
- }
- }
+ return utilArrayUniq(arr).map(function(s2) {
+ return {
+ shortcut: s2,
+ separator: d2.separator,
+ suffix: d2.suffix
+ };
+ });
+ }).enter().each(function(d2, i3, nodes) {
+ var selection3 = select_default2(this);
+ var click = d2.shortcut.toLowerCase().match(/(.*).click/);
+ if (click && click[1]) {
+ selection3.call(svgIcon("#iD-walkthrough-mouse-" + click[1], "operation"));
+ } else if (d2.shortcut.toLowerCase() === "long-press") {
+ selection3.call(svgIcon("#iD-walkthrough-longpress", "longpress operation"));
+ } else if (d2.shortcut.toLowerCase() === "tap") {
+ selection3.call(svgIcon("#iD-walkthrough-tap", "tap operation"));
+ } else {
+ selection3.append("kbd").attr("class", "shortcut").text(function(d4) {
+ return d4.shortcut;
+ });
}
- if (newWikipediaValue) {
- newWikipediaValue = context.cleanTagValue(newWikipediaValue);
+ if (i3 < nodes.length - 1) {
+ selection3.append("span").html(d2.separator || "\xA0" + _t.html("shortcuts.or") + "\xA0");
+ } else if (i3 === nodes.length - 1 && d2.suffix) {
+ selection3.append("span").text(d2.suffix);
}
- if (typeof newWikipediaValue === "undefined")
- return;
- var actions = initEntityIDs.map(function(entityID) {
- var entity2 = context.hasEntity(entityID);
- if (!entity2)
- return null;
- var currTags = Object.assign({}, entity2.tags);
- if (newWikipediaValue === null) {
- if (!currTags[_wikipediaKey])
- return null;
- delete currTags[_wikipediaKey];
- } else {
- currTags[_wikipediaKey] = newWikipediaValue;
- }
- return actionChangeTags(entityID, currTags);
- }).filter(Boolean);
- if (!actions.length)
- return;
- context.overwrite(function actionUpdateWikipediaTags(graph) {
- actions.forEach(function(action) {
- graph = action(graph);
- });
- return graph;
- }, context.history().undoAnnotation());
+ });
+ shortcutKeys.filter(function(d2) {
+ return d2.gesture;
+ }).each(function() {
+ var selection3 = select_default2(this);
+ selection3.append("span").text("+");
+ selection3.append("span").attr("class", "gesture").html(function(d2) {
+ return _t.html(d2.gesture);
+ });
+ });
+ shortcutRows.append("td").attr("class", "shortcut-desc").html(function(d2) {
+ return d2.text ? _t.html(d2.text) : "\xA0";
+ });
+ wrapper.selectAll(".shortcut-tab").style("display", function(d2, i3) {
+ return i3 === _activeTab ? "flex" : "none";
});
}
- function setLabelForEntity() {
- var label = "";
- if (_wikidataEntity) {
- label = entityPropertyForDisplay(_wikidataEntity, "labels");
- if (label.length === 0) {
- label = _wikidataEntity.id.toString();
- }
+ return function(selection2, show) {
+ _selection = selection2;
+ if (show) {
+ _modalSelection = uiModal(selection2);
+ _modalSelection.call(shortcutsModal);
+ } else {
+ context.keybinding().on([_t("shortcuts.toggle.key"), "?"], function() {
+ if (context.container().selectAll(".modal-shortcuts").size()) {
+ if (_modalSelection) {
+ _modalSelection.close();
+ _modalSelection = null;
+ }
+ } else {
+ _modalSelection = uiModal(_selection);
+ _modalSelection.call(shortcutsModal);
+ }
+ });
}
- utilGetSetValue(_searchInput, label);
+ };
+ }
+
+ // modules/ui/data_header.js
+ function uiDataHeader() {
+ var _datum;
+ function dataHeader(selection2) {
+ var header = selection2.selectAll(".data-header").data(
+ _datum ? [_datum] : [],
+ function(d2) {
+ return d2.__featurehash__;
+ }
+ );
+ header.exit().remove();
+ var headerEnter = header.enter().append("div").attr("class", "data-header");
+ var iconEnter = headerEnter.append("div").attr("class", "data-header-icon");
+ iconEnter.append("div").attr("class", "preset-icon-28").call(svgIcon("#iD-icon-data", "note-fill"));
+ headerEnter.append("div").attr("class", "data-header-label").call(_t.append("map_data.layers.custom.title"));
}
- wiki.tags = function(tags) {
- var isMixed = Array.isArray(tags[field.key]);
- _searchInput.attr("title", isMixed ? tags[field.key].filter(Boolean).join("\n") : null).attr("placeholder", isMixed ? _t("inspector.multiple_values") : "").classed("mixed", isMixed);
- _qid = typeof tags[field.key] === "string" && tags[field.key] || "";
- if (!/^Q[0-9]*$/.test(_qid)) {
- unrecognized();
- return;
+ dataHeader.datum = function(val) {
+ if (!arguments.length) return _datum;
+ _datum = val;
+ return this;
+ };
+ return dataHeader;
+ }
+
+ // modules/ui/disclosure.js
+ function uiDisclosure(context, key, expandedDefault) {
+ var dispatch14 = dispatch_default("toggled");
+ var _expanded;
+ var _label = utilFunctor("");
+ var _updatePreference = true;
+ var _content = function() {
+ };
+ var disclosure = function(selection2) {
+ if (_expanded === void 0 || _expanded === null) {
+ var preference = corePreferences("disclosure." + key + ".expanded");
+ _expanded = preference === null ? !!expandedDefault : preference === "true";
}
- _wikiURL = "https://wikidata.org/wiki/" + _qid;
- wikidata.entityByQID(_qid, function(err, entity) {
- if (err) {
- unrecognized();
- return;
+ var hideToggle = selection2.selectAll(".hide-toggle-" + key).data([0]);
+ var hideToggleEnter = hideToggle.enter().append("h3").append("a").attr("role", "button").attr("href", "#").attr("class", "hide-toggle hide-toggle-" + key).call(svgIcon("", "pre-text", "hide-toggle-icon"));
+ hideToggleEnter.append("span").attr("class", "hide-toggle-text");
+ hideToggle = hideToggleEnter.merge(hideToggle);
+ hideToggle.on("click", toggle).attr("title", _t("icons.".concat(_expanded ? "collapse" : "expand"))).attr("aria-expanded", _expanded).classed("expanded", _expanded);
+ const label = _label();
+ const labelSelection = hideToggle.selectAll(".hide-toggle-text");
+ if (typeof label !== "function") {
+ labelSelection.text(_label());
+ } else {
+ labelSelection.text("").call(label);
+ }
+ hideToggle.selectAll(".hide-toggle-icon").attr(
+ "xlink:href",
+ _expanded ? "#iD-icon-down" : _mainLocalizer.textDirection() === "rtl" ? "#iD-icon-backward" : "#iD-icon-forward"
+ );
+ var wrap2 = selection2.selectAll(".disclosure-wrap").data([0]);
+ wrap2 = wrap2.enter().append("div").attr("class", "disclosure-wrap disclosure-wrap-" + key).merge(wrap2).classed("hide", !_expanded);
+ if (_expanded) {
+ wrap2.call(_content);
+ }
+ function toggle(d3_event) {
+ d3_event.preventDefault();
+ _expanded = !_expanded;
+ if (_updatePreference) {
+ corePreferences("disclosure." + key + ".expanded", _expanded);
}
- _wikidataEntity = entity;
- setLabelForEntity();
- var description2 = entityPropertyForDisplay(entity, "descriptions");
- _selection.select("button.wiki-link").classed("disabled", false);
- _selection.select(".preset-wikidata-description").style("display", function() {
- return description2.length > 0 ? "flex" : "none";
- }).select("input").attr("value", description2);
- _selection.select(".preset-wikidata-identifier").style("display", function() {
- return entity.id ? "flex" : "none";
- }).select("input").attr("value", entity.id);
- });
- function unrecognized() {
- _wikidataEntity = null;
- setLabelForEntity();
- _selection.select(".preset-wikidata-description").style("display", "none");
- _selection.select(".preset-wikidata-identifier").style("display", "none");
- _selection.select("button.wiki-link").classed("disabled", true);
- if (_qid && _qid !== "") {
- _wikiURL = "https://wikidata.org/wiki/Special:Search?search=" + _qid;
- } else {
- _wikiURL = "";
+ hideToggle.classed("expanded", _expanded).attr("aria-expanded", _expanded).attr("title", _t("icons.".concat(_expanded ? "collapse" : "expand")));
+ hideToggle.selectAll(".hide-toggle-icon").attr(
+ "xlink:href",
+ _expanded ? "#iD-icon-down" : _mainLocalizer.textDirection() === "rtl" ? "#iD-icon-backward" : "#iD-icon-forward"
+ );
+ wrap2.call(uiToggle(_expanded));
+ if (_expanded) {
+ wrap2.call(_content);
}
+ dispatch14.call("toggled", this, _expanded);
}
};
- function entityPropertyForDisplay(wikidataEntity, propKey) {
- if (!wikidataEntity[propKey])
- return "";
- var propObj = wikidataEntity[propKey];
- var langKeys = Object.keys(propObj);
- if (langKeys.length === 0)
- return "";
- var langs = wikidata.languagesToQuery();
- for (var i2 in langs) {
- var lang = langs[i2];
- var valueObj = propObj[lang];
- if (valueObj && valueObj.value && valueObj.value.length > 0)
- return valueObj.value;
- }
- return propObj[langKeys[0]].value;
- }
- wiki.entityIDs = function(val) {
- if (!arguments.length)
- return _entityIDs;
- _entityIDs = val;
- return wiki;
+ disclosure.label = function(val) {
+ if (!arguments.length) return _label;
+ _label = utilFunctor(val);
+ return disclosure;
};
- wiki.focus = function() {
- _searchInput.node().focus();
+ disclosure.expanded = function(val) {
+ if (!arguments.length) return _expanded;
+ _expanded = val;
+ return disclosure;
+ };
+ disclosure.updatePreference = function(val) {
+ if (!arguments.length) return _updatePreference;
+ _updatePreference = val;
+ return disclosure;
+ };
+ disclosure.content = function(val) {
+ if (!arguments.length) return _content;
+ _content = val;
+ return disclosure;
};
- return utilRebind(wiki, dispatch10, "on");
+ return utilRebind(disclosure, dispatch14, "on");
}
- // modules/ui/fields/wikipedia.js
- function uiFieldWikipedia(field, context) {
- const dispatch10 = dispatch_default("change");
- const wikipedia = services.wikipedia;
- const wikidata = services.wikidata;
- let _langInput = select_default2(null);
- let _titleInput = select_default2(null);
- let _wikiURL = "";
- let _entityIDs;
- let _tags;
- let _dataWikipedia = [];
- _mainFileFetcher.get("wmf_sitematrix").then((d) => {
- _dataWikipedia = d;
- if (_tags)
- updateForTags(_tags);
- }).catch(() => {
- });
- const langCombo = uiCombobox(context, "wikipedia-lang").fetcher((value, callback) => {
- const v = value.toLowerCase();
- callback(_dataWikipedia.filter((d) => {
- return d[0].toLowerCase().indexOf(v) >= 0 || d[1].toLowerCase().indexOf(v) >= 0 || d[2].toLowerCase().indexOf(v) >= 0;
- }).map((d) => ({ value: d[1] })));
- });
- const titleCombo = uiCombobox(context, "wikipedia-title").fetcher((value, callback) => {
- if (!value) {
- value = "";
- for (let i2 in _entityIDs) {
- let entity = context.hasEntity(_entityIDs[i2]);
- if (entity.tags.name) {
- value = entity.tags.name;
- break;
- }
+ // modules/ui/section.js
+ function uiSection(id2, context) {
+ var _classes = utilFunctor("");
+ var _shouldDisplay;
+ var _content;
+ var _disclosure;
+ var _label;
+ var _expandedByDefault = utilFunctor(true);
+ var _disclosureContent;
+ var _disclosureExpanded;
+ var _containerSelection = select_default2(null);
+ var section = {
+ id: id2
+ };
+ section.classes = function(val) {
+ if (!arguments.length) return _classes;
+ _classes = utilFunctor(val);
+ return section;
+ };
+ section.label = function(val) {
+ if (!arguments.length) return _label;
+ _label = utilFunctor(val);
+ return section;
+ };
+ section.expandedByDefault = function(val) {
+ if (!arguments.length) return _expandedByDefault;
+ _expandedByDefault = utilFunctor(val);
+ return section;
+ };
+ section.shouldDisplay = function(val) {
+ if (!arguments.length) return _shouldDisplay;
+ _shouldDisplay = utilFunctor(val);
+ return section;
+ };
+ section.content = function(val) {
+ if (!arguments.length) return _content;
+ _content = val;
+ return section;
+ };
+ section.disclosureContent = function(val) {
+ if (!arguments.length) return _disclosureContent;
+ _disclosureContent = val;
+ return section;
+ };
+ section.disclosureExpanded = function(val) {
+ if (!arguments.length) return _disclosureExpanded;
+ _disclosureExpanded = val;
+ return section;
+ };
+ section.render = function(selection2) {
+ _containerSelection = selection2.selectAll(".section-" + id2).data([0]);
+ var sectionEnter = _containerSelection.enter().append("div").attr("class", "section section-" + id2 + " " + (_classes && _classes() || ""));
+ _containerSelection = sectionEnter.merge(_containerSelection);
+ _containerSelection.call(renderContent);
+ };
+ section.reRender = function() {
+ _containerSelection.call(renderContent);
+ };
+ section.selection = function() {
+ return _containerSelection;
+ };
+ section.disclosure = function() {
+ return _disclosure;
+ };
+ function renderContent(selection2) {
+ if (_shouldDisplay) {
+ var shouldDisplay = _shouldDisplay();
+ selection2.classed("hide", !shouldDisplay);
+ if (!shouldDisplay) {
+ selection2.html("");
+ return;
}
}
- const searchfn = value.length > 7 ? wikipedia.search : wikipedia.suggestions;
- searchfn(language()[2], value, (query, data) => {
- callback(data.map((d) => ({ value: d })));
- });
- });
- function wiki(selection2) {
- let wrap2 = selection2.selectAll(".form-field-input-wrap").data([0]);
- wrap2 = wrap2.enter().append("div").attr("class", `form-field-input-wrap form-field-input-${field.type}`).merge(wrap2);
- let langContainer = wrap2.selectAll(".wiki-lang-container").data([0]);
- langContainer = langContainer.enter().append("div").attr("class", "wiki-lang-container").merge(langContainer);
- _langInput = langContainer.selectAll("input.wiki-lang").data([0]);
- _langInput = _langInput.enter().append("input").attr("type", "text").attr("class", "wiki-lang").attr("placeholder", _t("translate.localized_translation_language")).call(utilNoAuto).call(langCombo).merge(_langInput);
- _langInput.on("blur", changeLang).on("change", changeLang);
- let titleContainer = wrap2.selectAll(".wiki-title-container").data([0]);
- titleContainer = titleContainer.enter().append("div").attr("class", "wiki-title-container").merge(titleContainer);
- _titleInput = titleContainer.selectAll("input.wiki-title").data([0]);
- _titleInput = _titleInput.enter().append("input").attr("type", "text").attr("class", "wiki-title").attr("id", field.domId).call(utilNoAuto).call(titleCombo).merge(_titleInput);
- _titleInput.on("blur", function() {
- change(true);
- }).on("change", function() {
- change(false);
- });
- let link2 = titleContainer.selectAll(".wiki-link").data([0]);
- link2 = link2.enter().append("button").attr("class", "form-field-button wiki-link").attr("title", _t("icons.view_on", { domain: "wikipedia.org" })).call(svgIcon("#iD-icon-out-link")).merge(link2);
- link2.on("click", (d3_event) => {
- d3_event.preventDefault();
- if (_wikiURL)
- window.open(_wikiURL, "_blank");
- });
- }
- function defaultLanguageInfo(skipEnglishFallback) {
- const langCode = _mainLocalizer.languageCode().toLowerCase();
- for (let i2 in _dataWikipedia) {
- let d = _dataWikipedia[i2];
- if (d[2] === langCode)
- return d;
+ if (_disclosureContent) {
+ if (!_disclosure) {
+ _disclosure = uiDisclosure(context, id2.replace(/-/g, "_"), _expandedByDefault()).label(_label || "").content(_disclosureContent);
+ }
+ if (_disclosureExpanded !== void 0) {
+ _disclosure.expanded(_disclosureExpanded);
+ _disclosureExpanded = void 0;
+ }
+ selection2.call(_disclosure);
+ return;
}
- return skipEnglishFallback ? ["", "", ""] : ["English", "English", "en"];
- }
- function language(skipEnglishFallback) {
- const value = utilGetSetValue(_langInput).toLowerCase();
- for (let i2 in _dataWikipedia) {
- let d = _dataWikipedia[i2];
- if (d[0].toLowerCase() === value || d[1].toLowerCase() === value || d[2] === value)
- return d;
+ if (_content) {
+ selection2.call(_content);
}
- return defaultLanguageInfo(skipEnglishFallback);
}
- function changeLang() {
- utilGetSetValue(_langInput, language()[1]);
- change(true);
+ return section;
+ }
+
+ // modules/ui/tag_reference.js
+ function uiTagReference(what) {
+ var wikibase = what.qid ? services.wikidata : services.osmWikibase;
+ var tagReference = {};
+ var _button = select_default2(null);
+ var _body = select_default2(null);
+ var _loaded;
+ var _showing;
+ function load() {
+ if (!wikibase) return;
+ _button.classed("tag-reference-loading", true);
+ wikibase.getDocs(what, gotDocs);
}
- function change(skipWikidata) {
- let value = utilGetSetValue(_titleInput);
- const m = value.match(/https?:\/\/([-a-z]+)\.wikipedia\.org\/(?:wiki|\1-[-a-z]+)\/([^#]+)(?:#(.+))?/);
- const langInfo = m && _dataWikipedia.find((d) => m[1] === d[2]);
- let syncTags = {};
- if (langInfo) {
- const nativeLangName = langInfo[1];
- value = decodeURIComponent(m[2]).replace(/_/g, " ");
- if (m[3]) {
- let anchor;
- anchor = decodeURIComponent(m[3]);
- value += "#" + anchor.replace(/_/g, " ");
- }
- value = value.slice(0, 1).toUpperCase() + value.slice(1);
- utilGetSetValue(_langInput, nativeLangName);
- utilGetSetValue(_titleInput, value);
+ function gotDocs(err, docs) {
+ _body.html("");
+ if (!docs || !docs.title) {
+ _body.append("p").attr("class", "tag-reference-description").call(_t.append("inspector.no_documentation_key"));
+ done();
+ return;
}
- if (value) {
- syncTags.wikipedia = context.cleanTagValue(language()[2] + ":" + value);
+ if (docs.imageURL) {
+ _body.append("img").attr("class", "tag-reference-wiki-image").attr("alt", docs.description).attr("src", docs.imageURL).on("load", function() {
+ done();
+ }).on("error", function() {
+ select_default2(this).remove();
+ done();
+ });
} else {
- syncTags.wikipedia = void 0;
+ done();
}
- dispatch10.call("change", this, syncTags);
- if (skipWikidata || !value || !language()[2])
- return;
- const initGraph = context.graph();
- const initEntityIDs = _entityIDs;
- wikidata.itemsByTitle(language()[2], value, (err, data) => {
- if (err || !data || !Object.keys(data).length)
- return;
- if (context.graph() !== initGraph)
- return;
- const qids = Object.keys(data);
- const value2 = qids && qids.find((id2) => id2.match(/^Q\d+$/));
- let actions = initEntityIDs.map((entityID) => {
- let entity = context.entity(entityID).tags;
- let currTags = Object.assign({}, entity);
- if (currTags.wikidata !== value2) {
- currTags.wikidata = value2;
- return actionChangeTags(entityID, currTags);
- }
- return null;
- }).filter(Boolean);
- if (!actions.length)
- return;
- context.overwrite(function actionUpdateWikidataTags(graph) {
- actions.forEach(function(action) {
- graph = action(graph);
- });
- return graph;
- }, context.history().undoAnnotation());
+ var tagReferenceDescription = _body.append("p").attr("class", "tag-reference-description").append("span");
+ if (docs.description) {
+ tagReferenceDescription = tagReferenceDescription.attr("class", "localized-text").attr("lang", docs.descriptionLocaleCode || "und").text(docs.description);
+ } else {
+ tagReferenceDescription = tagReferenceDescription.call(_t.append("inspector.no_documentation_key"));
+ }
+ tagReferenceDescription.append("a").attr("class", "tag-reference-edit").attr("target", "_blank").attr("title", _t("inspector.edit_reference")).attr("href", docs.editURL).call(svgIcon("#iD-icon-edit", "inline"));
+ if (docs.wiki) {
+ _body.append("a").attr("class", "tag-reference-link").attr("target", "_blank").attr("href", docs.wiki.url).call(svgIcon("#iD-icon-out-link", "inline")).append("span").call(_t.append(docs.wiki.text));
+ }
+ if (what.key === "comment") {
+ _body.append("a").attr("class", "tag-reference-comment-link").attr("target", "_blank").call(svgIcon("#iD-icon-out-link", "inline")).attr("href", _t("commit.about_changeset_comments_link")).append("span").call(_t.append("commit.about_changeset_comments"));
+ }
+ }
+ function done() {
+ _loaded = true;
+ _button.classed("tag-reference-loading", false);
+ _body.classed("expanded", true).transition().duration(200).style("max-height", "200px").style("opacity", "1");
+ _showing = true;
+ _button.selectAll("svg.icon use").each(function() {
+ var iconUse = select_default2(this);
+ if (iconUse.attr("href") === "#iD-icon-info") {
+ iconUse.attr("href", "#iD-icon-info-filled");
+ }
});
}
- wiki.tags = (tags) => {
- _tags = tags;
- updateForTags(tags);
- };
- function updateForTags(tags) {
- const value = typeof tags[field.key] === "string" ? tags[field.key] : "";
- const m = value.match(/([^:]+):([^#]+)(?:#(.+))?/);
- const tagLang = m && m[1];
- const tagArticleTitle = m && m[2];
- let anchor = m && m[3];
- const tagLangInfo = tagLang && _dataWikipedia.find((d) => tagLang === d[2]);
- if (tagLangInfo) {
- const nativeLangName = tagLangInfo[1];
- utilGetSetValue(_langInput, nativeLangName);
- utilGetSetValue(_titleInput, tagArticleTitle + (anchor ? "#" + anchor : ""));
- if (anchor) {
- try {
- anchor = encodeURIComponent(anchor.replace(/ /g, "_")).replace(/%/g, ".");
- } catch (e) {
- anchor = anchor.replace(/ /g, "_");
- }
+ function hide() {
+ _body.transition().duration(200).style("max-height", "0px").style("opacity", "0").on("end", function() {
+ _body.classed("expanded", false);
+ });
+ _showing = false;
+ _button.selectAll("svg.icon use").each(function() {
+ var iconUse = select_default2(this);
+ if (iconUse.attr("href") === "#iD-icon-info-filled") {
+ iconUse.attr("href", "#iD-icon-info");
}
- _wikiURL = "https://" + tagLang + ".wikipedia.org/wiki/" + tagArticleTitle.replace(/ /g, "_") + (anchor ? "#" + anchor : "");
- } else {
- utilGetSetValue(_titleInput, value);
- if (value && value !== "") {
- utilGetSetValue(_langInput, "");
- const defaultLangInfo = defaultLanguageInfo();
- _wikiURL = `https://${defaultLangInfo[2]}.wikipedia.org/w/index.php?fulltext=1&search=${value}`;
+ });
+ }
+ tagReference.button = function(selection2, klass, iconName) {
+ _button = selection2.selectAll(".tag-reference-button").data([0]);
+ _button = _button.enter().append("button").attr("class", "tag-reference-button " + (klass || "")).attr("title", _t("icons.information")).call(svgIcon("#iD-icon-" + (iconName || "inspect"))).merge(_button);
+ _button.on("click", function(d3_event) {
+ d3_event.stopPropagation();
+ d3_event.preventDefault();
+ this.blur();
+ if (_showing) {
+ hide();
+ } else if (_loaded) {
+ done();
} else {
- const shownOrDefaultLangInfo = language(true);
- utilGetSetValue(_langInput, shownOrDefaultLangInfo[1]);
- _wikiURL = "";
+ load();
}
+ });
+ };
+ tagReference.body = function(selection2) {
+ var itemID = what.qid || what.key + "-" + (what.value || "");
+ _body = selection2.selectAll(".tag-reference-body").data([itemID], function(d2) {
+ return d2;
+ });
+ _body.exit().remove();
+ _body = _body.enter().append("div").attr("class", "tag-reference-body").style("max-height", "0").style("opacity", "0").merge(_body);
+ if (_showing === false) {
+ hide();
}
- }
- wiki.entityIDs = (val) => {
- if (!arguments.length)
- return _entityIDs;
- _entityIDs = val;
- return wiki;
};
- wiki.focus = () => {
- _titleInput.node().focus();
+ tagReference.showing = function(val) {
+ if (!arguments.length) return _showing;
+ _showing = val;
+ return tagReference;
};
- return utilRebind(wiki, dispatch10, "on");
+ return tagReference;
}
- uiFieldWikipedia.supportsMultiselection = false;
-
- // modules/ui/fields/index.js
- var uiFields = {
- access: uiFieldAccess,
- address: uiFieldAddress,
- check: uiFieldCheck,
- combo: uiFieldCombo,
- cycleway: uiFieldCycleway,
- defaultCheck: uiFieldCheck,
- email: uiFieldText,
- identifier: uiFieldText,
- lanes: uiFieldLanes,
- localized: uiFieldLocalized,
- roadheight: uiFieldRoadheight,
- roadspeed: uiFieldRoadspeed,
- manyCombo: uiFieldCombo,
- multiCombo: uiFieldCombo,
- networkCombo: uiFieldCombo,
- number: uiFieldText,
- onewayCheck: uiFieldCheck,
- radio: uiFieldRadio,
- restrictions: uiFieldRestrictions,
- semiCombo: uiFieldCombo,
- structureRadio: uiFieldRadio,
- tel: uiFieldText,
- text: uiFieldText,
- textarea: uiFieldTextarea,
- typeCombo: uiFieldCombo,
- url: uiFieldText,
- wikidata: uiFieldWikidata,
- wikipedia: uiFieldWikipedia
- };
- // modules/ui/field.js
- function uiField(context, presetField2, entityIDs, options2) {
- options2 = Object.assign({
- show: true,
- wrap: true,
- remove: true,
- revert: true,
- info: true
- }, options2);
- var dispatch10 = dispatch_default("change", "revert");
- var field = Object.assign({}, presetField2);
- field.domId = utilUniqueDomId("form-field-" + field.safeid);
- var _show = options2.show;
- var _state = "";
- var _tags = {};
- var _entityExtent;
- if (entityIDs && entityIDs.length) {
- _entityExtent = entityIDs.reduce(function(extent, entityID) {
- var entity = context.graph().entity(entityID);
- return extent.extend(entity.extent(context.graph()));
- }, geoExtent());
- }
- var _locked = false;
- var _lockedTip = uiTooltip().title(_t.html("inspector.lock.suggestion", { label: field.label })).placement("bottom");
- field.keys = field.keys || [field.key];
- if (_show && !field.impl) {
- createField();
+ // modules/ui/sections/raw_tag_editor.js
+ function uiSectionRawTagEditor(id2, context) {
+ var section = uiSection(id2, context).classes("raw-tag-editor").label(function() {
+ var count = Object.keys(_tags).filter(function(d2) {
+ return d2;
+ }).length;
+ return _t.append("inspector.title_count", { title: _t("inspector.tags"), count });
+ }).expandedByDefault(false).disclosureContent(renderDisclosureContent);
+ var taginfo = services.taginfo;
+ var dispatch14 = dispatch_default("change");
+ var availableViews = [
+ { id: "list", icon: "#fas-th-list" },
+ { id: "text", icon: "#fas-i-cursor" }
+ ];
+ let _discardTags = {};
+ _mainFileFetcher.get("discarded").then((d2) => {
+ _discardTags = d2;
+ }).catch(() => {
+ });
+ var _tagView = corePreferences("raw-tag-editor-view") || "list";
+ var _readOnlyTags = [];
+ var _orderedKeys = [];
+ var _showBlank = false;
+ var _pendingChange = null;
+ var _state;
+ var _presets;
+ var _tags;
+ var _entityIDs;
+ var _didInteract = false;
+ function interacted() {
+ _didInteract = true;
}
- function createField() {
- field.impl = uiFields[field.type](field, context).on("change", function(t, onInput) {
- dispatch10.call("change", field, t, onInput);
+ function renderDisclosureContent(wrap2) {
+ _orderedKeys = _orderedKeys.filter(function(key) {
+ return _tags[key] !== void 0;
});
- if (entityIDs) {
- field.entityIDs = entityIDs;
- if (field.impl.entityIDs) {
- field.impl.entityIDs(entityIDs);
- }
+ var all = Object.keys(_tags).sort();
+ var missingKeys = utilArrayDifference(all, _orderedKeys);
+ for (var i3 in missingKeys) {
+ _orderedKeys.push(missingKeys[i3]);
}
- }
- function isModified() {
- if (!entityIDs || !entityIDs.length)
- return false;
- return entityIDs.some(function(entityID) {
- var original = context.graph().base().entities[entityID];
- var latest = context.graph().entity(entityID);
- return field.keys.some(function(key) {
- return original ? latest.tags[key] !== original.tags[key] : latest.tags[key];
+ var rowData = _orderedKeys.map(function(key, i4) {
+ return { index: i4, key, value: _tags[key] };
+ });
+ if (!rowData.length || _showBlank) {
+ _showBlank = false;
+ rowData.push({ index: rowData.length, key: "", value: "" });
+ }
+ var options2 = wrap2.selectAll(".raw-tag-options").data([0]);
+ options2.exit().remove();
+ var optionsEnter = options2.enter().insert("div", ":first-child").attr("class", "raw-tag-options").attr("role", "tablist");
+ var optionEnter = optionsEnter.selectAll(".raw-tag-option").data(availableViews, function(d2) {
+ return d2.id;
+ }).enter();
+ optionEnter.append("button").attr("class", function(d2) {
+ return "raw-tag-option raw-tag-option-" + d2.id + (_tagView === d2.id ? " selected" : "");
+ }).attr("aria-selected", function(d2) {
+ return _tagView === d2.id;
+ }).attr("role", "tab").attr("title", function(d2) {
+ return _t("icons." + d2.id);
+ }).on("click", function(d3_event, d2) {
+ _tagView = d2.id;
+ corePreferences("raw-tag-editor-view", d2.id);
+ wrap2.selectAll(".raw-tag-option").classed("selected", function(datum2) {
+ return datum2 === d2;
+ }).attr("aria-selected", function(datum2) {
+ return datum2 === d2;
});
+ wrap2.selectAll(".tag-text").classed("hide", d2.id !== "text").each(setTextareaHeight);
+ wrap2.selectAll(".tag-list, .add-row").classed("hide", d2.id !== "list");
+ }).each(function(d2) {
+ select_default2(this).call(svgIcon(d2.icon));
});
- }
- function tagsContainFieldKey() {
- return field.keys.some(function(key) {
- if (field.type === "multiCombo") {
- for (var tagKey in _tags) {
- if (tagKey.indexOf(key) === 0) {
- return true;
- }
- }
- return false;
- }
- return _tags[key] !== void 0;
+ var textData = rowsToText(rowData);
+ var textarea = wrap2.selectAll(".tag-text").data([0]);
+ textarea = textarea.enter().append("textarea").attr("class", "tag-text" + (_tagView !== "text" ? " hide" : "")).call(utilNoAuto).attr("placeholder", _t("inspector.key_value")).attr("spellcheck", "false").merge(textarea);
+ textarea.call(utilGetSetValue, textData).each(setTextareaHeight).on("input", setTextareaHeight).on("focus", interacted).on("blur", textChanged).on("change", textChanged);
+ var list2 = wrap2.selectAll(".tag-list").data([0]);
+ list2 = list2.enter().append("ul").attr("class", "tag-list" + (_tagView !== "list" ? " hide" : "")).merge(list2);
+ var addRowEnter = wrap2.selectAll(".add-row").data([0]).enter().append("div").attr("class", "add-row" + (_tagView !== "list" ? " hide" : ""));
+ addRowEnter.append("button").attr("class", "add-tag").attr("aria-label", _t("inspector.add_to_tag")).call(svgIcon("#iD-icon-plus", "light")).call(uiTooltip().title(() => _t.append("inspector.add_to_tag")).placement(_mainLocalizer.textDirection() === "ltr" ? "right" : "left")).on("click", addTag);
+ addRowEnter.append("div").attr("class", "space-value");
+ addRowEnter.append("div").attr("class", "space-buttons");
+ var items = list2.selectAll(".tag-row").data(rowData, function(d2) {
+ return d2.key;
});
- }
- function revert(d3_event, d) {
- d3_event.stopPropagation();
- d3_event.preventDefault();
- if (!entityIDs || _locked)
- return;
- dispatch10.call("revert", d, d.keys);
- }
- function remove2(d3_event, d) {
- d3_event.stopPropagation();
- d3_event.preventDefault();
- if (_locked)
- return;
- var t = {};
- d.keys.forEach(function(key) {
- t[key] = void 0;
+ items.exit().each(unbind).remove();
+ var itemsEnter = items.enter().append("li").attr("class", "tag-row").classed("readonly", isReadOnly);
+ var innerWrap = itemsEnter.append("div").attr("class", "inner-wrap");
+ innerWrap.append("div").attr("class", "key-wrap").append("input").property("type", "text").attr("class", "key").call(utilNoAuto).on("focus", interacted).on("blur", keyChange).on("change", keyChange);
+ innerWrap.append("div").attr("class", "value-wrap").append("input").property("type", "text").attr("class", "value").call(utilNoAuto).on("focus", interacted).on("blur", valueChange).on("change", valueChange).on("keydown.push-more", pushMore);
+ innerWrap.append("button").attr("class", "form-field-button remove").attr("title", _t("icons.remove")).call(svgIcon("#iD-operation-delete"));
+ items = items.merge(itemsEnter).sort(function(a2, b2) {
+ return a2.index - b2.index;
});
- dispatch10.call("change", d, t);
- }
- field.render = function(selection2) {
- var container = selection2.selectAll(".form-field").data([field]);
- var enter = container.enter().append("div").attr("class", function(d) {
- return "form-field form-field-" + d.safeid;
- }).classed("nowrap", !options2.wrap);
- if (options2.wrap) {
- var labelEnter = enter.append("label").attr("class", "field-label").attr("for", function(d) {
- return d.domId;
- });
- var textEnter = labelEnter.append("span").attr("class", "label-text");
- textEnter.append("span").attr("class", "label-textvalue").html(function(d) {
- return d.label();
- });
- textEnter.append("span").attr("class", "label-textannotation");
- if (options2.remove) {
- labelEnter.append("button").attr("class", "remove-icon").attr("title", _t("icons.remove")).call(svgIcon("#iD-operation-delete"));
- }
- if (options2.revert) {
- labelEnter.append("button").attr("class", "modified-icon").attr("title", _t("icons.undo")).call(svgIcon(_mainLocalizer.textDirection() === "rtl" ? "#iD-icon-redo" : "#iD-icon-undo"));
+ items.each(function(d2) {
+ var row = select_default2(this);
+ var key = row.select("input.key");
+ var value = row.select("input.value");
+ if (_entityIDs && taginfo && _state !== "hover") {
+ bindTypeahead(key, value);
}
- }
- container = container.merge(enter);
- container.select(".field-label > .remove-icon").on("click", remove2);
- container.select(".field-label > .modified-icon").on("click", revert);
- container.each(function(d) {
- var selection3 = select_default2(this);
- if (!d.impl) {
- createField();
+ var referenceOptions = { key: d2.key };
+ if (typeof d2.value === "string") {
+ referenceOptions.value = d2.value;
}
- var reference, help;
- if (options2.wrap && field.type === "restrictions") {
- help = uiFieldHelp(context, "restrictions");
+ var reference = uiTagReference(referenceOptions, context);
+ if (_state === "hover") {
+ reference.showing(false);
}
- if (options2.wrap && options2.info) {
- var referenceKey = d.key || "";
- if (d.type === "multiCombo") {
- referenceKey = referenceKey.replace(/:$/, "");
- }
- reference = uiTagReference(d.reference || { key: referenceKey }, context);
- if (_state === "hover") {
- reference.showing(false);
- }
+ row.select(".inner-wrap").call(reference.button);
+ row.call(reference.body);
+ row.select("button.remove");
+ });
+ items.selectAll("input.key").attr("title", function(d2) {
+ return d2.key;
+ }).call(utilGetSetValue, function(d2) {
+ return d2.key;
+ }).attr("readonly", function(d2) {
+ return isReadOnly(d2) || null;
+ });
+ items.selectAll("input.value").attr("title", function(d2) {
+ return Array.isArray(d2.value) ? d2.value.filter(Boolean).join("\n") : d2.value;
+ }).classed("mixed", function(d2) {
+ return Array.isArray(d2.value);
+ }).attr("placeholder", function(d2) {
+ return typeof d2.value === "string" ? null : _t("inspector.multiple_values");
+ }).call(utilGetSetValue, function(d2) {
+ return typeof d2.value === "string" ? d2.value : "";
+ }).attr("readonly", function(d2) {
+ return isReadOnly(d2) || null;
+ });
+ items.selectAll("button.remove").on(
+ ("PointerEvent" in window ? "pointer" : "mouse") + "down",
+ // 'click' fires too late - #5878
+ (d3_event, d2) => {
+ if (d3_event.button !== 0) return;
+ removeTag(d3_event, d2);
+ }
+ );
+ }
+ function isReadOnly(d2) {
+ for (var i3 = 0; i3 < _readOnlyTags.length; i3++) {
+ if (d2.key.match(_readOnlyTags[i3]) !== null) {
+ return true;
}
- selection3.call(d.impl);
- if (help) {
- selection3.call(help.body).select(".field-label").call(help.button);
+ }
+ return false;
+ }
+ function setTextareaHeight() {
+ if (_tagView !== "text") return;
+ var selection2 = select_default2(this);
+ var matches = selection2.node().value.match(/\n/g);
+ var lineCount = 2 + Number(matches && matches.length);
+ var lineHeight = 20;
+ selection2.style("height", lineCount * lineHeight + "px");
+ }
+ function stringify3(s2) {
+ const stringified = JSON.stringify(s2).slice(1, -1);
+ if (stringified !== s2) {
+ return '"'.concat(stringified, '"');
+ } else {
+ return s2;
+ }
+ }
+ function unstringify(s2) {
+ const isQuoted = s2.length > 1 && s2.charAt(0) === '"' && s2.charAt(s2.length - 1) === '"';
+ if (isQuoted) {
+ try {
+ return JSON.parse(s2);
+ } catch (e3) {
+ return s2;
}
- if (reference) {
- selection3.call(reference.body).select(".field-label").call(reference.button);
+ } else {
+ return s2;
+ }
+ }
+ function rowsToText(rows) {
+ var str = rows.filter(function(row) {
+ return row.key && row.key.trim() !== "";
+ }).map(function(row) {
+ var rawVal = row.value;
+ if (typeof rawVal !== "string") rawVal = "*";
+ var val = rawVal ? stringify3(rawVal) : "";
+ return stringify3(row.key) + "=" + val;
+ }).join("\n");
+ if (_state !== "hover" && str.length) {
+ return str + "\n";
+ }
+ return str;
+ }
+ function textChanged() {
+ var newText = this.value.trim();
+ var newTags = {};
+ newText.split("\n").forEach(function(row) {
+ var m2 = row.match(/^\s*([^=]+)=(.*)$/);
+ if (m2 !== null) {
+ var k2 = context.cleanTagKey(unstringify(m2[1].trim()));
+ var v2 = context.cleanTagValue(unstringify(m2[2].trim()));
+ newTags[k2] = v2;
}
- d.impl.tags(_tags);
});
- container.classed("locked", _locked).classed("modified", isModified()).classed("present", tagsContainFieldKey());
- var annotation = container.selectAll(".field-label .label-textannotation");
- var icon2 = annotation.selectAll(".icon").data(_locked ? [0] : []);
- icon2.exit().remove();
- icon2.enter().append("svg").attr("class", "icon").append("use").attr("xlink:href", "#fas-lock");
- container.call(_locked ? _lockedTip : _lockedTip.destroy);
- };
- field.state = function(val) {
- if (!arguments.length)
- return _state;
- _state = val;
- return field;
- };
- field.tags = function(val) {
- if (!arguments.length)
- return _tags;
- _tags = val;
- if (tagsContainFieldKey() && !_show) {
- _show = true;
- if (!field.impl) {
- createField();
+ var tagDiff = utilTagDiff(_tags, newTags);
+ _pendingChange = _pendingChange || {};
+ tagDiff.forEach(function(change) {
+ if (isReadOnly({ key: change.key })) return;
+ if (change.newVal === "*" && typeof change.oldVal !== "string") return;
+ if (change.type === "-") {
+ _pendingChange[change.key] = void 0;
+ } else if (change.type === "+") {
+ _pendingChange[change.key] = change.newVal || "";
}
+ });
+ if (Object.keys(_pendingChange).length === 0) {
+ _pendingChange = null;
+ section.reRender();
+ return;
}
- return field;
- };
- field.locked = function(val) {
- if (!arguments.length)
- return _locked;
- _locked = val;
- return field;
- };
- field.show = function() {
- _show = true;
- if (!field.impl) {
- createField();
+ scheduleChange();
+ }
+ function pushMore(d3_event) {
+ if (d3_event.keyCode === 9 && !d3_event.shiftKey && section.selection().selectAll(".tag-list li:last-child input.value").node() === this && utilGetSetValue(select_default2(this))) {
+ addTag();
}
- if (field.default && field.key && _tags[field.key] !== field.default) {
- var t = {};
- t[field.key] = field.default;
- dispatch10.call("change", this, t);
+ }
+ function bindTypeahead(key, value) {
+ if (isReadOnly(key.datum())) return;
+ if (Array.isArray(value.datum().value)) {
+ value.call(uiCombobox(context, "tag-value").minItems(1).fetcher(function(value2, callback) {
+ var keyString = utilGetSetValue(key);
+ if (!_tags[keyString]) return;
+ var data = _tags[keyString].map(function(tagValue) {
+ if (!tagValue) {
+ return {
+ value: " ",
+ title: _t("inspector.empty"),
+ display: (selection2) => selection2.text("").classed("virtual-option", true).call(_t.append("inspector.empty"))
+ };
+ }
+ return {
+ value: tagValue,
+ title: tagValue
+ };
+ });
+ callback(data);
+ }));
+ return;
}
- };
- field.isShown = function() {
- return _show;
- };
- field.isAllowed = function() {
- if (entityIDs && entityIDs.length > 1 && uiFields[field.type].supportsMultiselection === false)
- return false;
- if (field.geometry && !entityIDs.every(function(entityID) {
- return field.matchGeometry(context.graph().geometry(entityID));
- }))
- return false;
- if (entityIDs && _entityExtent && field.locationSetID) {
- var validLocations = _mainLocations.locationsAt(_entityExtent.center());
- if (!validLocations[field.locationSetID])
- return false;
+ var geometry = context.graph().geometry(_entityIDs[0]);
+ key.call(uiCombobox(context, "tag-key").fetcher(function(value2, callback) {
+ taginfo.keys({
+ debounce: true,
+ geometry,
+ query: value2
+ }, function(err, data) {
+ if (!err) {
+ const filtered = data.filter((d2) => _tags[d2.value] === void 0).filter((d2) => !(d2.value in _discardTags)).filter((d2) => !/_\d$/.test(d2)).filter((d2) => d2.value.toLowerCase().includes(value2.toLowerCase()));
+ callback(sort(value2, filtered));
+ }
+ });
+ }));
+ value.call(uiCombobox(context, "tag-value").fetcher(function(value2, callback) {
+ taginfo.values({
+ debounce: true,
+ key: utilGetSetValue(key),
+ geometry,
+ query: value2
+ }, function(err, data) {
+ if (!err) {
+ const filtered = data.filter((d2) => d2.value.toLowerCase().includes(value2.toLowerCase()));
+ callback(sort(value2, filtered));
+ }
+ });
+ }).caseSensitive(allowUpperCaseTagValues.test(utilGetSetValue(key))));
+ function sort(value2, data) {
+ var sameletter = [];
+ var other2 = [];
+ for (var i3 = 0; i3 < data.length; i3++) {
+ if (data[i3].value.substring(0, value2.length) === value2) {
+ sameletter.push(data[i3]);
+ } else {
+ other2.push(data[i3]);
+ }
+ }
+ return sameletter.concat(other2);
}
- var prerequisiteTag = field.prerequisiteTag;
- if (entityIDs && !tagsContainFieldKey() && prerequisiteTag) {
- if (!entityIDs.every(function(entityID) {
- var entity = context.graph().entity(entityID);
- if (prerequisiteTag.key) {
- var value = entity.tags[prerequisiteTag.key];
- if (!value)
- return false;
- if (prerequisiteTag.valueNot) {
- return prerequisiteTag.valueNot !== value;
- }
- if (prerequisiteTag.value) {
- return prerequisiteTag.value === value;
- }
- } else if (prerequisiteTag.keyNot) {
- if (entity.tags[prerequisiteTag.keyNot])
- return false;
+ }
+ function unbind() {
+ var row = select_default2(this);
+ row.selectAll("input.key").call(uiCombobox.off, context);
+ row.selectAll("input.value").call(uiCombobox.off, context);
+ }
+ function keyChange(d3_event, d2) {
+ if (select_default2(this).attr("readonly")) return;
+ var kOld = d2.key;
+ if (_pendingChange && _pendingChange.hasOwnProperty(kOld) && _pendingChange[kOld] === void 0) return;
+ var kNew = context.cleanTagKey(this.value.trim());
+ if (isReadOnly({ key: kNew })) {
+ this.value = kOld;
+ return;
+ }
+ if (kNew && kNew !== kOld && _tags[kNew] !== void 0) {
+ this.value = kOld;
+ section.selection().selectAll(".tag-list input.value").each(function(d4) {
+ if (d4.key === kNew) {
+ var input = select_default2(this).node();
+ input.focus();
+ input.select();
}
- return true;
- }))
- return false;
+ });
+ return;
}
- return true;
- };
- field.focus = function() {
- if (field.impl) {
- field.impl.focus();
+ _pendingChange = _pendingChange || {};
+ if (kOld) {
+ if (kOld === kNew) return;
+ _pendingChange[kNew] = _pendingChange[kOld] || { oldKey: kOld };
+ _pendingChange[kOld] = void 0;
+ } else {
+ let row = this.parentNode.parentNode;
+ let inputVal = select_default2(row).selectAll("input.value");
+ let vNew = context.cleanTagValue(utilGetSetValue(inputVal));
+ _pendingChange[kNew] = vNew;
+ utilGetSetValue(inputVal, vNew);
}
- };
- return utilRebind(field, dispatch10, "on");
- }
-
- // modules/ui/form_fields.js
- function uiFormFields(context) {
- var moreCombo = uiCombobox(context, "more-fields").minItems(1);
- var _fieldsArr = [];
- var _lastPlaceholder = "";
- var _state = "";
- var _klass = "";
- function formFields(selection2) {
- var allowedFields = _fieldsArr.filter(function(field) {
- return field.isAllowed();
- });
- var shown = allowedFields.filter(function(field) {
- return field.isShown();
- });
- var notShown = allowedFields.filter(function(field) {
- return !field.isShown();
- });
- var container = selection2.selectAll(".form-fields-container").data([0]);
- container = container.enter().append("div").attr("class", "form-fields-container " + (_klass || "")).merge(container);
- var fields = container.selectAll(".wrap-form-field").data(shown, function(d) {
- return d.id + (d.entityIDs ? d.entityIDs.join() : "");
- });
- fields.exit().remove();
- var enter = fields.enter().append("div").attr("class", function(d) {
- return "wrap-form-field wrap-form-field-" + d.safeid;
- });
- fields = fields.merge(enter);
- fields.order().each(function(d) {
- select_default2(this).call(d.render);
- });
- var titles = [];
- var moreFields = notShown.map(function(field) {
- var title = field.title();
- titles.push(title);
- var terms = field.terms();
- if (field.key)
- terms.push(field.key);
- if (field.keys)
- terms = terms.concat(field.keys);
- return {
- display: field.label(),
- value: title,
- title,
- field,
- terms
- };
- });
- var placeholder = titles.slice(0, 3).join(", ") + (titles.length > 3 ? "\u2026" : "");
- var more = selection2.selectAll(".more-fields").data(_state === "hover" || moreFields.length === 0 ? [] : [0]);
- more.exit().remove();
- var moreEnter = more.enter().append("div").attr("class", "more-fields").append("label");
- moreEnter.append("span").call(_t.append("inspector.add_fields"));
- more = moreEnter.merge(more);
- var input = more.selectAll(".value").data([0]);
- input.exit().remove();
- input = input.enter().append("input").attr("class", "value").attr("type", "text").attr("placeholder", placeholder).call(utilNoAuto).merge(input);
- input.call(utilGetSetValue, "").call(moreCombo.data(moreFields).on("accept", function(d) {
- if (!d)
- return;
- var field = d.field;
- field.show();
- selection2.call(formFields);
- field.focus();
- }));
- if (_lastPlaceholder !== placeholder) {
- input.attr("placeholder", placeholder);
- _lastPlaceholder = placeholder;
+ var existingKeyIndex = _orderedKeys.indexOf(kOld);
+ if (existingKeyIndex !== -1) _orderedKeys[existingKeyIndex] = kNew;
+ d2.key = kNew;
+ this.value = kNew;
+ scheduleChange();
+ }
+ function valueChange(d3_event, d2) {
+ if (isReadOnly(d2)) return;
+ if (typeof d2.value !== "string" && !this.value) return;
+ if (_pendingChange && _pendingChange.hasOwnProperty(d2.key) && _pendingChange[d2.key] === void 0) return;
+ _pendingChange = _pendingChange || {};
+ _pendingChange[d2.key] = context.cleanTagValue(this.value);
+ scheduleChange();
+ }
+ function removeTag(d3_event, d2) {
+ if (isReadOnly(d2)) return;
+ if (d2.key === "") {
+ _showBlank = false;
+ section.reRender();
+ } else {
+ _orderedKeys = _orderedKeys.filter(function(key) {
+ return key !== d2.key;
+ });
+ _pendingChange = _pendingChange || {};
+ _pendingChange[d2.key] = void 0;
+ scheduleChange();
}
}
- formFields.fieldsArr = function(val) {
- if (!arguments.length)
- return _fieldsArr;
- _fieldsArr = val || [];
- return formFields;
+ function addTag() {
+ window.setTimeout(function() {
+ _showBlank = true;
+ section.reRender();
+ section.selection().selectAll(".tag-list li:last-child input.key").node().focus();
+ }, 20);
+ }
+ function scheduleChange() {
+ var entityIDs = _entityIDs;
+ window.setTimeout(function() {
+ if (!_pendingChange) return;
+ dispatch14.call("change", this, entityIDs, _pendingChange);
+ _pendingChange = null;
+ }, 10);
+ }
+ section.state = function(val) {
+ if (!arguments.length) return _state;
+ if (_state !== val) {
+ _orderedKeys = [];
+ _state = val;
+ }
+ return section;
};
- formFields.state = function(val) {
- if (!arguments.length)
- return _state;
- _state = val;
- return formFields;
+ section.presets = function(val) {
+ if (!arguments.length) return _presets;
+ _presets = val;
+ if (_presets && _presets.length && _presets[0].isFallback()) {
+ section.disclosureExpanded(true);
+ } else if (!_didInteract) {
+ section.disclosureExpanded(null);
+ }
+ return section;
};
- formFields.klass = function(val) {
- if (!arguments.length)
- return _klass;
- _klass = val;
- return formFields;
+ section.tags = function(val) {
+ if (!arguments.length) return _tags;
+ _tags = val;
+ return section;
};
- return formFields;
- }
-
- // modules/ui/changeset_editor.js
- function uiChangesetEditor(context) {
- var dispatch10 = dispatch_default("change");
- var formFields = uiFormFields(context);
- var commentCombo = uiCombobox(context, "comment").caseSensitive(true);
- var _fieldsArr;
- var _tags;
- var _changesetID;
- function changesetEditor(selection2) {
- render(selection2);
- }
- function render(selection2) {
- var initial = false;
- if (!_fieldsArr) {
- initial = true;
- var presets = _mainPresetIndex;
- _fieldsArr = [
- uiField(context, presets.field("comment"), null, { show: true, revert: false }),
- uiField(context, presets.field("source"), null, { show: false, revert: false }),
- uiField(context, presets.field("hashtags"), null, { show: false, revert: false })
- ];
- _fieldsArr.forEach(function(field) {
- field.on("change", function(t, onInput) {
- dispatch10.call("change", field, void 0, t, onInput);
- });
- });
- }
- _fieldsArr.forEach(function(field) {
- field.tags(_tags);
- });
- selection2.call(formFields.fieldsArr(_fieldsArr));
- if (initial) {
- var commentField = selection2.select(".form-field-comment textarea");
- var commentNode = commentField.node();
- if (commentNode) {
- commentNode.focus();
- commentNode.select();
- }
- utilTriggerEvent(commentField, "blur");
- var osm = context.connection();
- if (osm) {
- osm.userChangesets(function(err, changesets) {
- if (err)
- return;
- var comments = changesets.map(function(changeset) {
- var comment = changeset.tags.comment;
- return comment ? { title: comment, value: comment } : null;
- }).filter(Boolean);
- commentField.call(commentCombo.data(utilArrayUniqBy(comments, "title")));
- });
- }
+ section.entityIDs = function(val) {
+ if (!arguments.length) return _entityIDs;
+ if (!_entityIDs || !val || !utilArrayIdentical(_entityIDs, val)) {
+ _entityIDs = val;
+ _orderedKeys = [];
}
- var hasGoogle = _tags.comment.match(/google/i);
- var commentWarning = selection2.select(".form-field-comment").selectAll(".comment-warning").data(hasGoogle ? [0] : []);
- commentWarning.exit().transition().duration(200).style("opacity", 0).remove();
- var commentEnter = commentWarning.enter().insert("div", ".tag-reference-body").attr("class", "field-warning comment-warning").style("opacity", 0);
- commentEnter.append("a").attr("target", "_blank").call(svgIcon("#iD-icon-alert", "inline")).attr("href", _t("commit.google_warning_link")).append("span").call(_t.append("commit.google_warning"));
- commentEnter.transition().duration(200).style("opacity", 1);
- }
- changesetEditor.tags = function(_) {
- if (!arguments.length)
- return _tags;
- _tags = _;
- return changesetEditor;
+ return section;
};
- changesetEditor.changesetID = function(_) {
- if (!arguments.length)
- return _changesetID;
- if (_changesetID === _)
- return changesetEditor;
- _changesetID = _;
- _fieldsArr = null;
- return changesetEditor;
+ section.readOnlyTags = function(val) {
+ if (!arguments.length) return _readOnlyTags;
+ _readOnlyTags = val;
+ return section;
};
- return utilRebind(changesetEditor, dispatch10, "on");
+ return utilRebind(section, dispatch14, "on");
}
- // modules/ui/commit.js
- var import_fast_deep_equal9 = __toESM(require_fast_deep_equal());
+ // modules/ui/data_editor.js
+ function uiDataEditor(context) {
+ var dataHeader = uiDataHeader();
+ var rawTagEditor = uiSectionRawTagEditor("custom-data-tag-editor", context).expandedByDefault(true).readOnlyTags([/./]);
+ var _datum;
+ function dataEditor(selection2) {
+ var header = selection2.selectAll(".header").data([0]);
+ var headerEnter = header.enter().append("div").attr("class", "header fillL");
+ headerEnter.append("button").attr("class", "close").attr("title", _t("icons.close")).on("click", function() {
+ context.enter(modeBrowse(context));
+ }).call(svgIcon("#iD-icon-close"));
+ headerEnter.append("h2").call(_t.append("map_data.title"));
+ var body = selection2.selectAll(".body").data([0]);
+ body = body.enter().append("div").attr("class", "body").merge(body);
+ var editor = body.selectAll(".data-editor").data([0]);
+ editor.enter().append("div").attr("class", "modal-section data-editor").merge(editor).call(dataHeader.datum(_datum));
+ var rte = body.selectAll(".raw-tag-editor").data([0]);
+ rte.enter().append("div").attr("class", "raw-tag-editor data-editor").merge(rte).call(
+ rawTagEditor.tags(_datum && _datum.properties || {}).state("hover").render
+ ).selectAll("textarea.tag-text").attr("readonly", true).classed("readonly", true);
+ }
+ dataEditor.datum = function(val) {
+ if (!arguments.length) return _datum;
+ _datum = val;
+ return this;
+ };
+ return dataEditor;
+ }
- // modules/util/jxon.js
- var JXON = new function() {
- var sValueProp = "keyValue", sAttributesProp = "keyAttributes", sAttrPref = "@", aCache = [], rIsNull = /^\s*$/, rIsBool = /^(?:true|false)$/i;
- function parseText(sValue) {
- if (rIsNull.test(sValue)) {
- return null;
- }
- if (rIsBool.test(sValue)) {
- return sValue.toLowerCase() === "true";
- }
- if (isFinite(sValue)) {
- return parseFloat(sValue);
+ // modules/ui/feature_list.js
+ var sexagesimal = __toESM(require_sexagesimal());
+ function uiFeatureList(context) {
+ var _geocodeResults;
+ function featureList(selection2) {
+ var header = selection2.append("div").attr("class", "header fillL");
+ header.append("h2").call(_t.append("inspector.feature_list"));
+ var searchWrap = selection2.append("div").attr("class", "search-header");
+ searchWrap.call(svgIcon("#iD-icon-search", "pre-text"));
+ var search = searchWrap.append("input").attr("placeholder", _t("inspector.search")).attr("type", "search").call(utilNoAuto).on("keypress", keypress).on("keydown", keydown).on("input", inputevent);
+ var listWrap = selection2.append("div").attr("class", "inspector-body");
+ var list2 = listWrap.append("div").attr("class", "feature-list");
+ context.on("exit.feature-list", clearSearch);
+ context.map().on("drawn.feature-list", mapDrawn);
+ context.keybinding().on(uiCmd("\u2318F"), focusSearch);
+ function focusSearch(d3_event) {
+ var mode = context.mode() && context.mode().id;
+ if (mode !== "browse") return;
+ d3_event.preventDefault();
+ search.node().focus();
}
- if (isFinite(Date.parse(sValue))) {
- return new Date(sValue);
+ function keydown(d3_event) {
+ if (d3_event.keyCode === 27) {
+ search.node().blur();
+ }
}
- return sValue;
- }
- function EmptyTree() {
- }
- EmptyTree.prototype.toString = function() {
- return "null";
- };
- EmptyTree.prototype.valueOf = function() {
- return null;
- };
- function objectify(vValue) {
- return vValue === null ? new EmptyTree() : vValue instanceof Object ? vValue : new vValue.constructor(vValue);
- }
- function createObjTree(oParentNode, nVerb, bFreeze, bNesteAttr) {
- var nLevelStart = aCache.length, bChildren = oParentNode.hasChildNodes(), bAttributes = oParentNode.hasAttributes(), bHighVerb = Boolean(nVerb & 2);
- var sProp, vContent, nLength = 0, sCollectedTxt = "", vResult = bHighVerb ? {} : true;
- if (bChildren) {
- for (var oNode, nItem = 0; nItem < oParentNode.childNodes.length; nItem++) {
- oNode = oParentNode.childNodes.item(nItem);
- if (oNode.nodeType === 4) {
- sCollectedTxt += oNode.nodeValue;
- } else if (oNode.nodeType === 3) {
- sCollectedTxt += oNode.nodeValue.trim();
- } else if (oNode.nodeType === 1 && !oNode.prefix) {
- aCache.push(oNode);
- }
+ function keypress(d3_event) {
+ var q2 = search.property("value"), items = list2.selectAll(".feature-list-item");
+ if (d3_event.keyCode === 13 && // â© Return
+ q2.length && items.size()) {
+ click(d3_event, items.datum());
}
}
- var nLevelEnd = aCache.length, vBuiltVal = parseText(sCollectedTxt);
- if (!bHighVerb && (bChildren || bAttributes)) {
- vResult = nVerb === 0 ? objectify(vBuiltVal) : {};
+ function inputevent() {
+ _geocodeResults = void 0;
+ drawList();
}
- for (var nElId = nLevelStart; nElId < nLevelEnd; nElId++) {
- sProp = aCache[nElId].nodeName.toLowerCase();
- vContent = createObjTree(aCache[nElId], nVerb, bFreeze, bNesteAttr);
- if (vResult.hasOwnProperty(sProp)) {
- if (vResult[sProp].constructor !== Array) {
- vResult[sProp] = [vResult[sProp]];
- }
- vResult[sProp].push(vContent);
- } else {
- vResult[sProp] = vContent;
- nLength++;
+ function clearSearch() {
+ search.property("value", "");
+ drawList();
+ }
+ function mapDrawn(e3) {
+ if (e3.full) {
+ drawList();
}
}
- if (bAttributes) {
- var nAttrLen = oParentNode.attributes.length, sAPrefix = bNesteAttr ? "" : sAttrPref, oAttrParent = bNesteAttr ? {} : vResult;
- for (var oAttrib, nAttrib = 0; nAttrib < nAttrLen; nLength++, nAttrib++) {
- oAttrib = oParentNode.attributes.item(nAttrib);
- oAttrParent[sAPrefix + oAttrib.name.toLowerCase()] = parseText(oAttrib.value.trim());
+ function features() {
+ var result = [];
+ var graph = context.graph();
+ var visibleCenter = context.map().extent().center();
+ var q2 = search.property("value").toLowerCase();
+ if (!q2) return result;
+ var locationMatch = sexagesimal.pair(q2.toUpperCase()) || dmsMatcher(q2);
+ if (locationMatch) {
+ var loc = [Number(locationMatch[0]), Number(locationMatch[1])];
+ result.push({
+ id: loc[0] + "/" + loc[1],
+ geometry: "point",
+ type: _t("inspector.location"),
+ name: dmsCoordinatePair([loc[1], loc[0]]),
+ location: loc
+ });
}
- if (bNesteAttr) {
- if (bFreeze) {
- Object.freeze(oAttrParent);
+ var idMatch = !locationMatch && q2.match(/(?:^|\W)(node|way|relation|note|[nwr])\W{0,2}0*([1-9]\d*)(?:\W|$)/i);
+ if (idMatch) {
+ var elemType = idMatch[1] === "note" ? idMatch[1] : idMatch[1].charAt(0);
+ var elemId = idMatch[2];
+ result.push({
+ id: elemType + elemId,
+ geometry: elemType === "n" ? "point" : elemType === "w" ? "line" : elemType === "note" ? "note" : "relation",
+ type: elemType === "n" ? _t("inspector.node") : elemType === "w" ? _t("inspector.way") : elemType === "note" ? _t("note.note") : _t("inspector.relation"),
+ name: elemId
+ });
+ }
+ var allEntities = graph.entities;
+ var localResults = [];
+ for (var id2 in allEntities) {
+ var entity = allEntities[id2];
+ if (!entity) continue;
+ var name = utilDisplayName(entity) || "";
+ if (name.toLowerCase().indexOf(q2) < 0) continue;
+ var matched = _mainPresetIndex.match(entity, graph);
+ var type2 = matched && matched.name() || utilDisplayType(entity.id);
+ var extent = entity.extent(graph);
+ var distance = extent ? geoSphericalDistance(visibleCenter, extent.center()) : 0;
+ localResults.push({
+ id: entity.id,
+ entity,
+ geometry: entity.geometry(graph),
+ type: type2,
+ name,
+ distance
+ });
+ if (localResults.length > 100) break;
+ }
+ localResults = localResults.sort(function byDistance(a2, b2) {
+ return a2.distance - b2.distance;
+ });
+ result = result.concat(localResults);
+ (_geocodeResults || []).forEach(function(d2) {
+ if (d2.osm_type && d2.osm_id) {
+ var id3 = osmEntity.id.fromOSM(d2.osm_type, d2.osm_id);
+ var tags = {};
+ tags[d2.class] = d2.type;
+ var attrs = { id: id3, type: d2.osm_type, tags };
+ if (d2.osm_type === "way") {
+ attrs.nodes = ["a", "a"];
+ }
+ var tempEntity = osmEntity(attrs);
+ var tempGraph = coreGraph([tempEntity]);
+ var matched2 = _mainPresetIndex.match(tempEntity, tempGraph);
+ var type3 = matched2 && matched2.name() || utilDisplayType(id3);
+ result.push({
+ id: tempEntity.id,
+ geometry: tempEntity.geometry(tempGraph),
+ type: type3,
+ name: d2.display_name,
+ extent: new geoExtent(
+ [Number(d2.boundingbox[3]), Number(d2.boundingbox[0])],
+ [Number(d2.boundingbox[2]), Number(d2.boundingbox[1])]
+ )
+ });
}
- vResult[sAttributesProp] = oAttrParent;
- nLength -= nAttrLen - 1;
+ });
+ if (q2.match(/^[0-9]+$/)) {
+ result.push({
+ id: "n" + q2,
+ geometry: "point",
+ type: _t("inspector.node"),
+ name: q2
+ });
+ result.push({
+ id: "w" + q2,
+ geometry: "line",
+ type: _t("inspector.way"),
+ name: q2
+ });
+ result.push({
+ id: "r" + q2,
+ geometry: "relation",
+ type: _t("inspector.relation"),
+ name: q2
+ });
+ result.push({
+ id: "note" + q2,
+ geometry: "note",
+ type: _t("note.note"),
+ name: q2
+ });
}
+ return result;
}
- if (nVerb === 3 || (nVerb === 2 || nVerb === 1 && nLength > 0) && sCollectedTxt) {
- vResult[sValueProp] = vBuiltVal;
- } else if (!bHighVerb && nLength === 0 && sCollectedTxt) {
- vResult = vBuiltVal;
+ function drawList() {
+ var value = search.property("value");
+ var results = features();
+ list2.classed("filtered", value.length);
+ var resultsIndicator = list2.selectAll(".no-results-item").data([0]).enter().append("button").property("disabled", true).attr("class", "no-results-item").call(svgIcon("#iD-icon-alert", "pre-text"));
+ resultsIndicator.append("span").attr("class", "entity-name");
+ list2.selectAll(".no-results-item .entity-name").html("").call(_t.append("geocoder.no_results_worldwide"));
+ if (services.geocoder) {
+ list2.selectAll(".geocode-item").data([0]).enter().append("button").attr("class", "geocode-item secondary-action").on("click", geocoderSearch).append("div").attr("class", "label").append("span").attr("class", "entity-name").call(_t.append("geocoder.search"));
+ }
+ list2.selectAll(".no-results-item").style("display", value.length && !results.length ? "block" : "none");
+ list2.selectAll(".geocode-item").style("display", value && _geocodeResults === void 0 ? "block" : "none");
+ var items = list2.selectAll(".feature-list-item").data(results, function(d2) {
+ return d2.id;
+ });
+ var enter = items.enter().insert("button", ".geocode-item").attr("class", "feature-list-item").on("pointerenter", mouseover).on("pointerleave", mouseout).on("focus", mouseover).on("blur", mouseout).on("click", click);
+ var label = enter.append("div").attr("class", "label");
+ label.each(function(d2) {
+ select_default2(this).call(svgIcon("#iD-icon-" + d2.geometry, "pre-text"));
+ });
+ label.append("span").attr("class", "entity-type").text(function(d2) {
+ return d2.type;
+ });
+ label.append("span").attr("class", "entity-name").classed("has-colour", (d2) => d2.entity && d2.entity.type === "relation" && d2.entity.tags.colour && isColourValid(d2.entity.tags.colour)).style("border-color", (d2) => d2.entity && d2.entity.type === "relation" && d2.entity.tags.colour).text(function(d2) {
+ return d2.name;
+ });
+ enter.style("opacity", 0).transition().style("opacity", 1);
+ items.exit().each((d2) => mouseout(void 0, d2)).remove();
+ items.merge(enter).order();
}
- if (bFreeze && (bHighVerb || nLength > 0)) {
- Object.freeze(vResult);
+ function mouseover(d3_event, d2) {
+ if (d2.location !== void 0) return;
+ utilHighlightEntities([d2.id], true, context);
}
- aCache.length = nLevelStart;
- return vResult;
- }
- function loadObjTree(oXMLDoc, oParentEl, oParentObj) {
- var vValue, oChild;
- if (oParentObj instanceof String || oParentObj instanceof Number || oParentObj instanceof Boolean) {
- oParentEl.appendChild(oXMLDoc.createTextNode(oParentObj.toString()));
- } else if (oParentObj.constructor === Date) {
- oParentEl.appendChild(oXMLDoc.createTextNode(oParentObj.toGMTString()));
+ function mouseout(d3_event, d2) {
+ if (d2.location !== void 0) return;
+ utilHighlightEntities([d2.id], false, context);
}
- for (var sName in oParentObj) {
- vValue = oParentObj[sName];
- if (isFinite(sName) || vValue instanceof Function) {
- continue;
- }
- if (sName === sValueProp) {
- if (vValue !== null && vValue !== true) {
- oParentEl.appendChild(oXMLDoc.createTextNode(vValue.constructor === Date ? vValue.toGMTString() : String(vValue)));
- }
- } else if (sName === sAttributesProp) {
- for (var sAttrib in vValue) {
- oParentEl.setAttribute(sAttrib, vValue[sAttrib]);
- }
- } else if (sName.charAt(0) === sAttrPref) {
- oParentEl.setAttribute(sName.slice(1), vValue);
- } else if (vValue.constructor === Array) {
- for (var nItem = 0; nItem < vValue.length; nItem++) {
- oChild = oXMLDoc.createElement(sName);
- loadObjTree(oXMLDoc, oChild, vValue[nItem]);
- oParentEl.appendChild(oChild);
- }
+ function click(d3_event, d2) {
+ d3_event.preventDefault();
+ if (d2.location) {
+ context.map().centerZoomEase([d2.location[1], d2.location[0]], 19);
+ } else if (d2.entity) {
+ utilHighlightEntities([d2.id], false, context);
+ context.enter(modeSelect(context, [d2.entity.id]));
+ context.map().zoomToEase(d2.entity);
+ } else if (d2.geometry === "note") {
+ const noteId = d2.id.replace(/\D/g, "");
+ context.zoomToNote(noteId);
} else {
- oChild = oXMLDoc.createElement(sName);
- if (vValue instanceof Object) {
- loadObjTree(oXMLDoc, oChild, vValue);
- } else if (vValue !== null && vValue !== true) {
- oChild.appendChild(oXMLDoc.createTextNode(vValue.toString()));
- }
- oParentEl.appendChild(oChild);
+ context.zoomToEntity(d2.id);
}
}
+ function geocoderSearch() {
+ services.geocoder.search(search.property("value"), function(err, resp) {
+ _geocodeResults = resp || [];
+ drawList();
+ });
+ }
}
- this.build = function(oXMLParent, nVerbosity, bFreeze, bNesteAttributes) {
- var _nVerb = arguments.length > 1 && typeof nVerbosity === "number" ? nVerbosity & 3 : 1;
- return createObjTree(oXMLParent, _nVerb, bFreeze || false, arguments.length > 3 ? bNesteAttributes : _nVerb === 3);
- };
- this.unbuild = function(oObjTree) {
- var oNewDoc = document.implementation.createDocument("", "", null);
- loadObjTree(oNewDoc, oNewDoc, oObjTree);
- return oNewDoc;
- };
- this.stringify = function(oObjTree) {
- return new XMLSerializer().serializeToString(JXON.unbuild(oObjTree));
- };
- }();
+ return featureList;
+ }
- // modules/ui/sections/changes.js
- function uiSectionChanges(context) {
- var _discardTags = {};
- _mainFileFetcher.get("discarded").then(function(d) {
- _discardTags = d;
- }).catch(function() {
- });
- var section = uiSection("changes-list", context).label(function() {
- var history = context.history();
- var summary = history.difference().summary();
- return _t.html("inspector.title_count", { title: { html: _t.html("commit.changes") }, count: summary.length });
+ // modules/ui/entity_editor.js
+ var import_fast_deep_equal9 = __toESM(require_fast_deep_equal());
+
+ // modules/ui/sections/entity_issues.js
+ function uiSectionEntityIssues(context) {
+ var preference = corePreferences("entity-issues.reference.expanded");
+ var _expanded = preference === null ? true : preference === "true";
+ var _entityIDs = [];
+ var _issues = [];
+ var _activeIssueID;
+ var section = uiSection("entity-issues", context).shouldDisplay(function() {
+ return _issues.length > 0;
+ }).label(function() {
+ return _t.append("inspector.title_count", { title: _t("issues.list_title"), count: _issues.length });
}).disclosureContent(renderDisclosureContent);
+ context.validator().on("validated.entity_issues", function() {
+ reloadIssues();
+ section.reRender();
+ }).on("focusedIssue.entity_issues", function(issue) {
+ makeActiveIssue(issue.id);
+ });
+ function reloadIssues() {
+ _issues = context.validator().getSharedEntityIssues(_entityIDs, { includeDisabledRules: true });
+ }
+ function makeActiveIssue(issueID) {
+ _activeIssueID = issueID;
+ section.selection().selectAll(".issue-container").classed("active", function(d2) {
+ return d2.id === _activeIssueID;
+ });
+ }
function renderDisclosureContent(selection2) {
- var history = context.history();
- var summary = history.difference().summary();
- var container = selection2.selectAll(".commit-section").data([0]);
- var containerEnter = container.enter().append("div").attr("class", "commit-section");
- containerEnter.append("ul").attr("class", "changeset-list");
- container = containerEnter.merge(container);
- var items = container.select("ul").selectAll("li").data(summary);
- var itemsEnter = items.enter().append("li").attr("class", "change-item");
- var buttons = itemsEnter.append("button").on("mouseover", mouseover).on("mouseout", mouseout).on("click", click);
- buttons.each(function(d) {
- select_default2(this).call(svgIcon("#iD-icon-" + d.entity.geometry(d.graph), "pre-text " + d.changeType));
+ selection2.classed("grouped-items-area", true);
+ _activeIssueID = _issues.length > 0 ? _issues[0].id : null;
+ var containers = selection2.selectAll(".issue-container").data(_issues, function(d2) {
+ return d2.key;
+ });
+ containers.exit().remove();
+ var containersEnter = containers.enter().append("div").attr("class", "issue-container");
+ var itemsEnter = containersEnter.append("div").attr("class", function(d2) {
+ return "issue severity-" + d2.severity;
+ }).on("mouseover.highlight", function(d3_event, d2) {
+ var ids = d2.entityIds.filter(function(e3) {
+ return _entityIDs.indexOf(e3) === -1;
+ });
+ utilHighlightEntities(ids, true, context);
+ }).on("mouseout.highlight", function(d3_event, d2) {
+ var ids = d2.entityIds.filter(function(e3) {
+ return _entityIDs.indexOf(e3) === -1;
+ });
+ utilHighlightEntities(ids, false, context);
+ });
+ var labelsEnter = itemsEnter.append("div").attr("class", "issue-label");
+ var textEnter = labelsEnter.append("button").attr("class", "issue-text").on("click", function(d3_event, d2) {
+ makeActiveIssue(d2.id);
+ var extent = d2.extent(context.graph());
+ if (extent) {
+ var setZoom = Math.max(context.map().zoom(), 19);
+ context.map().unobscuredCenterZoomEase(extent.center(), setZoom);
+ }
+ });
+ textEnter.each(function(d2) {
+ var iconName = "#iD-icon-" + (d2.severity === "warning" ? "alert" : "error");
+ select_default2(this).call(svgIcon(iconName, "issue-icon"));
+ });
+ textEnter.append("span").attr("class", "issue-message");
+ var infoButton = labelsEnter.append("button").attr("class", "issue-info-button").attr("title", _t("icons.information")).call(svgIcon("#iD-icon-inspect"));
+ infoButton.on("click", function(d3_event) {
+ d3_event.stopPropagation();
+ d3_event.preventDefault();
+ this.blur();
+ var container = select_default2(this.parentNode.parentNode.parentNode);
+ var info = container.selectAll(".issue-info");
+ var isExpanded = info.classed("expanded");
+ _expanded = !isExpanded;
+ corePreferences("entity-issues.reference.expanded", _expanded);
+ if (isExpanded) {
+ info.transition().duration(200).style("max-height", "0px").style("opacity", "0").on("end", function() {
+ info.classed("expanded", false);
+ });
+ } else {
+ info.classed("expanded", true).transition().duration(200).style("max-height", "200px").style("opacity", "1").on("end", function() {
+ info.style("max-height", null);
+ });
+ }
+ });
+ itemsEnter.append("ul").attr("class", "issue-fix-list");
+ containersEnter.append("div").attr("class", "issue-info" + (_expanded ? " expanded" : "")).style("max-height", _expanded ? null : "0").style("opacity", _expanded ? "1" : "0").each(function(d2) {
+ if (typeof d2.reference === "function") {
+ select_default2(this).call(d2.reference);
+ } else {
+ select_default2(this).call(_t.append("inspector.no_documentation_key"));
+ }
+ });
+ containers = containers.merge(containersEnter).classed("active", function(d2) {
+ return d2.id === _activeIssueID;
+ });
+ containers.selectAll(".issue-message").text("").each(function(d2) {
+ return d2.message(context)(select_default2(this));
+ });
+ var fixLists = containers.selectAll(".issue-fix-list");
+ var fixes = fixLists.selectAll(".issue-fix-item").data(function(d2) {
+ return d2.fixes ? d2.fixes(context) : [];
+ }, function(fix) {
+ return fix.id;
+ });
+ fixes.exit().remove();
+ var fixesEnter = fixes.enter().append("li").attr("class", "issue-fix-item");
+ var buttons = fixesEnter.append("button").on("click", function(d3_event, d2) {
+ if (select_default2(this).attr("disabled") || !d2.onClick) return;
+ if (d2.issue.dateLastRanFix && /* @__PURE__ */ new Date() - d2.issue.dateLastRanFix < 1e3) return;
+ d2.issue.dateLastRanFix = /* @__PURE__ */ new Date();
+ utilHighlightEntities(d2.issue.entityIds.concat(d2.entityIds), false, context);
+ new Promise(function(resolve, reject) {
+ d2.onClick(context, resolve, reject);
+ if (d2.onClick.length <= 1) {
+ resolve();
+ }
+ }).then(function() {
+ context.validator().validate();
+ });
+ }).on("mouseover.highlight", function(d3_event, d2) {
+ utilHighlightEntities(d2.entityIds, true, context);
+ }).on("mouseout.highlight", function(d3_event, d2) {
+ utilHighlightEntities(d2.entityIds, false, context);
+ });
+ buttons.each(function(d2) {
+ var iconName = d2.icon || "iD-icon-wrench";
+ if (iconName.startsWith("maki")) {
+ iconName += "-15";
+ }
+ select_default2(this).call(svgIcon("#" + iconName, "fix-icon"));
+ });
+ buttons.append("span").attr("class", "fix-message").each(function(d2) {
+ return d2.title(select_default2(this));
+ });
+ fixesEnter.merge(fixes).selectAll("button").classed("actionable", function(d2) {
+ return d2.onClick;
+ }).attr("disabled", function(d2) {
+ return d2.onClick ? null : "true";
+ }).attr("title", function(d2) {
+ if (d2.disabledReason) {
+ return d2.disabledReason;
+ }
+ return null;
+ });
+ }
+ section.entityIDs = function(val) {
+ if (!arguments.length) return _entityIDs;
+ if (!_entityIDs || !val || !utilArrayIdentical(_entityIDs, val)) {
+ _entityIDs = val;
+ _activeIssueID = null;
+ reloadIssues();
+ }
+ return section;
+ };
+ return section;
+ }
+
+ // modules/ui/preset_icon.js
+ function uiPresetIcon() {
+ let _preset;
+ let _geometry;
+ function presetIcon(selection2) {
+ selection2.each(render);
+ }
+ function getIcon(p2, geom) {
+ if (p2.isFallback && p2.isFallback()) return geom === "vertex" ? "" : "iD-icon-" + p2.id;
+ if (p2.icon) return p2.icon;
+ if (geom === "line") return "iD-other-line";
+ if (geom === "vertex") return "temaki-vertex";
+ return "maki-marker-stroked";
+ }
+ function renderPointBorder(container, drawPoint) {
+ let pointBorder = container.selectAll(".preset-icon-point-border").data(drawPoint ? [0] : []);
+ pointBorder.exit().remove();
+ let pointBorderEnter = pointBorder.enter();
+ const w2 = 40;
+ const h2 = 40;
+ pointBorderEnter.append("svg").attr("class", "preset-icon-fill preset-icon-point-border").attr("width", w2).attr("height", h2).attr("viewBox", "0 0 ".concat(w2, " ").concat(h2)).append("path").attr("transform", "translate(11.5, 8)").attr("d", "M 17,8 C 17,13 11,21 8.5,23.5 C 6,21 0,13 0,8 C 0,4 4,-0.5 8.5,-0.5 C 13,-0.5 17,4 17,8 z");
+ pointBorder = pointBorderEnter.merge(pointBorder);
+ }
+ function renderCategoryBorder(container, category) {
+ let categoryBorder = container.selectAll(".preset-icon-category-border").data(category ? [0] : []);
+ categoryBorder.exit().remove();
+ let categoryBorderEnter = categoryBorder.enter();
+ const d2 = 60;
+ let svgEnter = categoryBorderEnter.append("svg").attr("class", "preset-icon-fill preset-icon-category-border").attr("width", d2).attr("height", d2).attr("viewBox", "0 0 ".concat(d2, " ").concat(d2));
+ svgEnter.append("path").attr("class", "area").attr("d", "M9.5,7.5 L25.5,7.5 L28.5,12.5 L49.5,12.5 C51.709139,12.5 53.5,14.290861 53.5,16.5 L53.5,43.5 C53.5,45.709139 51.709139,47.5 49.5,47.5 L10.5,47.5 C8.290861,47.5 6.5,45.709139 6.5,43.5 L6.5,12.5 L9.5,7.5 Z");
+ categoryBorder = categoryBorderEnter.merge(categoryBorder);
+ if (category) {
+ categoryBorder.selectAll("path").attr("class", "area ".concat(category.id));
+ }
+ }
+ function renderCircleFill(container, drawVertex) {
+ let vertexFill = container.selectAll(".preset-icon-fill-vertex").data(drawVertex ? [0] : []);
+ vertexFill.exit().remove();
+ let vertexFillEnter = vertexFill.enter();
+ const w2 = 60;
+ const h2 = 60;
+ const d2 = 40;
+ vertexFillEnter.append("svg").attr("class", "preset-icon-fill preset-icon-fill-vertex").attr("width", w2).attr("height", h2).attr("viewBox", "0 0 ".concat(w2, " ").concat(h2)).append("circle").attr("cx", w2 / 2).attr("cy", h2 / 2).attr("r", d2 / 2);
+ vertexFill = vertexFillEnter.merge(vertexFill);
+ }
+ function renderSquareFill(container, drawArea, tagClasses) {
+ let fill = container.selectAll(".preset-icon-fill-area").data(drawArea ? [0] : []);
+ fill.exit().remove();
+ let fillEnter = fill.enter();
+ const d2 = 60;
+ const w2 = d2;
+ const h2 = d2;
+ const l2 = d2 * 2 / 3;
+ const c1 = (w2 - l2) / 2;
+ const c2 = c1 + l2;
+ fillEnter = fillEnter.append("svg").attr("class", "preset-icon-fill preset-icon-fill-area").attr("width", w2).attr("height", h2).attr("viewBox", "0 0 ".concat(w2, " ").concat(h2));
+ ["fill", "stroke"].forEach((klass) => {
+ fillEnter.append("path").attr("d", "M".concat(c1, " ").concat(c1, " L").concat(c1, " ").concat(c2, " L").concat(c2, " ").concat(c2, " L").concat(c2, " ").concat(c1, " Z")).attr("class", "area ".concat(klass));
+ });
+ const rVertex = 2.5;
+ [[c1, c1], [c1, c2], [c2, c2], [c2, c1]].forEach((point) => {
+ fillEnter.append("circle").attr("class", "vertex").attr("cx", point[0]).attr("cy", point[1]).attr("r", rVertex);
+ });
+ const rMidpoint = 1.25;
+ [[c1, w2 / 2], [c2, w2 / 2], [h2 / 2, c1], [h2 / 2, c2]].forEach((point) => {
+ fillEnter.append("circle").attr("class", "midpoint").attr("cx", point[0]).attr("cy", point[1]).attr("r", rMidpoint);
+ });
+ fill = fillEnter.merge(fill);
+ fill.selectAll("path.stroke").attr("class", "area stroke ".concat(tagClasses));
+ fill.selectAll("path.fill").attr("class", "area fill ".concat(tagClasses));
+ }
+ function renderLine(container, drawLine, tagClasses) {
+ let line = container.selectAll(".preset-icon-line").data(drawLine ? [0] : []);
+ line.exit().remove();
+ let lineEnter = line.enter();
+ const d2 = 60;
+ const w2 = d2;
+ const h2 = d2;
+ const y2 = Math.round(d2 * 0.72);
+ const l2 = Math.round(d2 * 0.6);
+ const r2 = 2.5;
+ const x12 = (w2 - l2) / 2;
+ const x2 = x12 + l2;
+ lineEnter = lineEnter.append("svg").attr("class", "preset-icon-line").attr("width", w2).attr("height", h2).attr("viewBox", "0 0 ".concat(w2, " ").concat(h2));
+ ["casing", "stroke"].forEach((klass) => {
+ lineEnter.append("path").attr("d", "M".concat(x12, " ").concat(y2, " L").concat(x2, " ").concat(y2)).attr("class", "line ".concat(klass));
});
- buttons.append("span").attr("class", "change-type").html(function(d) {
- return _t.html("commit." + d.changeType) + " ";
+ [[x12 - 1, y2], [x2 + 1, y2]].forEach((point) => {
+ lineEnter.append("circle").attr("class", "vertex").attr("cx", point[0]).attr("cy", point[1]).attr("r", r2);
});
- buttons.append("strong").attr("class", "entity-type").text(function(d) {
- var matched = _mainPresetIndex.match(d.entity, d.graph);
- return matched && matched.name() || utilDisplayType(d.entity.id);
+ line = lineEnter.merge(line);
+ line.selectAll("path.stroke").attr("class", "line stroke ".concat(tagClasses));
+ line.selectAll("path.casing").attr("class", "line casing ".concat(tagClasses));
+ }
+ function renderRoute(container, drawRoute, p2) {
+ let route = container.selectAll(".preset-icon-route").data(drawRoute ? [0] : []);
+ route.exit().remove();
+ let routeEnter = route.enter();
+ const d2 = 60;
+ const w2 = d2;
+ const h2 = d2;
+ const y12 = Math.round(d2 * 0.8);
+ const y2 = Math.round(d2 * 0.68);
+ const l2 = Math.round(d2 * 0.6);
+ const r2 = 2;
+ const x12 = (w2 - l2) / 2;
+ const x2 = x12 + l2 / 3;
+ const x3 = x2 + l2 / 3;
+ const x4 = x3 + l2 / 3;
+ routeEnter = routeEnter.append("svg").attr("class", "preset-icon-route").attr("width", w2).attr("height", h2).attr("viewBox", "0 0 ".concat(w2, " ").concat(h2));
+ ["casing", "stroke"].forEach((klass) => {
+ routeEnter.append("path").attr("d", "M".concat(x12, " ").concat(y12, " L").concat(x2, " ").concat(y2)).attr("class", "segment0 line ".concat(klass));
+ routeEnter.append("path").attr("d", "M".concat(x2, " ").concat(y2, " L").concat(x3, " ").concat(y12)).attr("class", "segment1 line ".concat(klass));
+ routeEnter.append("path").attr("d", "M".concat(x3, " ").concat(y12, " L").concat(x4, " ").concat(y2)).attr("class", "segment2 line ".concat(klass));
});
- buttons.append("span").attr("class", "entity-name").text(function(d) {
- var name2 = utilDisplayName(d.entity) || "", string = "";
- if (name2 !== "") {
- string += ":";
- }
- return string += " " + name2;
+ [[x12, y12], [x2, y2], [x3, y12], [x4, y2]].forEach((point) => {
+ routeEnter.append("circle").attr("class", "vertex").attr("cx", point[0]).attr("cy", point[1]).attr("r", r2);
});
- items = itemsEnter.merge(items);
- var changeset = new osmChangeset().update({ id: void 0 });
- var changes = history.changes(actionDiscardTags(history.difference(), _discardTags));
- delete changeset.id;
- var data = JXON.stringify(changeset.osmChangeJXON(changes));
- var blob = new Blob([data], { type: "text/xml;charset=utf-8;" });
- var fileName = "changes.osc";
- var linkEnter = container.selectAll(".download-changes").data([0]).enter().append("a").attr("class", "download-changes");
- linkEnter.attr("href", window.URL.createObjectURL(blob)).attr("download", fileName);
- linkEnter.call(svgIcon("#iD-icon-load", "inline")).append("span").call(_t.append("commit.download_changes"));
- function mouseover(d) {
- if (d.entity) {
- context.surface().selectAll(utilEntityOrMemberSelector([d.entity.id], context.graph())).classed("hover", true);
- }
- }
- function mouseout() {
- context.surface().selectAll(".hover").classed("hover", false);
- }
- function click(d3_event, change) {
- if (change.changeType !== "deleted") {
- var entity = change.entity;
- context.map().zoomToEase(entity);
- context.surface().selectAll(utilEntityOrMemberSelector([entity.id], context.graph())).classed("hover", true);
+ route = routeEnter.merge(route);
+ if (drawRoute) {
+ let routeType = p2.tags.type === "waterway" ? "waterway" : p2.tags.route;
+ const segmentPresetIDs = routeSegments[routeType];
+ for (let i3 in segmentPresetIDs) {
+ const segmentPreset = _mainPresetIndex.item(segmentPresetIDs[i3]);
+ const segmentTagClasses = svgTagClasses().getClassesString(segmentPreset.tags, "");
+ route.selectAll("path.stroke.segment".concat(i3)).attr("class", "segment".concat(i3, " line stroke ").concat(segmentTagClasses));
+ route.selectAll("path.casing.segment".concat(i3)).attr("class", "segment".concat(i3, " line casing ").concat(segmentTagClasses));
}
}
}
- return section;
- }
-
- // modules/ui/commit_warnings.js
- function uiCommitWarnings(context) {
- function commitWarnings(selection2) {
- var issuesBySeverity = context.validator().getIssuesBySeverity({ what: "edited", where: "all", includeDisabledRules: true });
- for (var severity in issuesBySeverity) {
- var issues = issuesBySeverity[severity];
- if (severity !== "error") {
- issues = issues.filter(function(issue) {
- return issue.type !== "help_request";
- });
- }
- var section = severity + "-section";
- var issueItem = severity + "-item";
- var container = selection2.selectAll("." + section).data(issues.length ? [0] : []);
- container.exit().remove();
- var containerEnter = container.enter().append("div").attr("class", "modal-section " + section + " fillL2");
- containerEnter.append("h3").html(severity === "warning" ? _t.html("commit.warnings") : _t.html("commit.errors"));
- containerEnter.append("ul").attr("class", "changeset-list");
- container = containerEnter.merge(container);
- var items = container.select("ul").selectAll("li").data(issues, function(d) {
- return d.key;
- });
- items.exit().remove();
- var itemsEnter = items.enter().append("li").attr("class", issueItem);
- var buttons = itemsEnter.append("button").on("mouseover", function(d3_event, d) {
- if (d.entityIds) {
- context.surface().selectAll(utilEntityOrMemberSelector(d.entityIds, context.graph())).classed("hover", true);
- }
- }).on("mouseout", function() {
- context.surface().selectAll(".hover").classed("hover", false);
- }).on("click", function(d3_event, d) {
- context.validator().focusIssue(d);
- });
- buttons.call(svgIcon("#iD-icon-alert", "pre-text"));
- buttons.append("strong").attr("class", "issue-message");
- buttons.filter(function(d) {
- return d.tooltip;
- }).call(uiTooltip().title(function(d) {
- return d.tooltip;
- }).placement("top"));
- items = itemsEnter.merge(items);
- items.selectAll(".issue-message").html(function(d) {
- return d.message(context);
- });
- }
+ function renderSvgIcon(container, picon, geom, isFramed, category, tagClasses) {
+ const isMaki = picon && /^maki-/.test(picon);
+ const isTemaki = picon && /^temaki-/.test(picon);
+ const isFa = picon && /^fa[srb]-/.test(picon);
+ const isR\u00F6ntgen = picon && /^roentgen-/.test(picon);
+ const isiDIcon = picon && !(isMaki || isTemaki || isFa || isR\u00F6ntgen);
+ let icon2 = container.selectAll(".preset-icon").data(picon ? [0] : []);
+ icon2.exit().remove();
+ icon2 = icon2.enter().append("div").attr("class", "preset-icon").call(svgIcon("")).merge(icon2);
+ icon2.attr("class", "preset-icon " + (geom ? geom + "-geom" : "")).classed("category", category).classed("framed", isFramed).classed("preset-icon-iD", isiDIcon);
+ icon2.selectAll("svg").attr("class", "icon " + picon + " " + (!isiDIcon && geom !== "line" ? "" : tagClasses));
+ icon2.selectAll("use").attr("href", "#" + picon);
}
- return commitWarnings;
- }
-
- // modules/ui/commit.js
- var readOnlyTags = [
- /^changesets_count$/,
- /^created_by$/,
- /^ideditor:/,
- /^imagery_used$/,
- /^host$/,
- /^locale$/,
- /^warnings:/,
- /^resolved:/,
- /^closed:note$/,
- /^closed:keepright$/,
- /^closed:improveosm:/,
- /^closed:osmose:/
- ];
- var hashtagRegex = /(#[^\u2000-\u206F\u2E00-\u2E7F\s\\'!"#$%()*,.\/:;<=>?@\[\]^`{|}~]+)/g;
- function uiCommit(context) {
- var dispatch10 = dispatch_default("cancel");
- var _userDetails2;
- var _selection;
- var changesetEditor = uiChangesetEditor(context).on("change", changeTags);
- var rawTagEditor = uiSectionRawTagEditor("changeset-tag-editor", context).on("change", changeTags).readOnlyTags(readOnlyTags);
- var commitChanges = uiSectionChanges(context);
- var commitWarnings = uiCommitWarnings(context);
- function commit(selection2) {
- _selection = selection2;
- if (!context.changeset)
- initChangeset();
- loadDerivedChangesetTags();
- selection2.call(render);
+ function renderImageIcon(container, imageURL) {
+ let imageIcon = container.selectAll("img.image-icon").data(imageURL ? [0] : []);
+ imageIcon.exit().remove();
+ imageIcon = imageIcon.enter().append("img").attr("class", "image-icon").on("load", () => container.classed("showing-img", true)).on("error", () => container.classed("showing-img", false)).merge(imageIcon);
+ imageIcon.attr("src", imageURL);
}
- function initChangeset() {
- var commentDate = +corePreferences("commentDate") || 0;
- var currDate = Date.now();
- var cutoff = 2 * 86400 * 1e3;
- if (commentDate > currDate || currDate - commentDate > cutoff) {
- corePreferences("comment", null);
- corePreferences("hashtags", null);
- corePreferences("source", null);
- }
- if (context.defaultChangesetComment()) {
- corePreferences("comment", context.defaultChangesetComment());
- corePreferences("commentDate", Date.now());
- }
- if (context.defaultChangesetSource()) {
- corePreferences("source", context.defaultChangesetSource());
- corePreferences("commentDate", Date.now());
- }
- if (context.defaultChangesetHashtags()) {
- corePreferences("hashtags", context.defaultChangesetHashtags());
- corePreferences("commentDate", Date.now());
- }
- var detected = utilDetect();
- var tags = {
- comment: corePreferences("comment") || "",
- created_by: context.cleanTagValue("iD " + context.version),
- host: context.cleanTagValue(detected.host),
- locale: context.cleanTagValue(_mainLocalizer.localeCode())
- };
- findHashtags(tags, true);
- var hashtags = corePreferences("hashtags");
- if (hashtags) {
- tags.hashtags = hashtags;
- }
- var source = corePreferences("source");
- if (source) {
- tags.source = source;
+ const routeSegments = {
+ bicycle: ["highway/cycleway", "highway/cycleway", "highway/cycleway"],
+ bus: ["highway/unclassified", "highway/secondary", "highway/primary"],
+ trolleybus: ["highway/unclassified", "highway/secondary", "highway/primary"],
+ detour: ["highway/tertiary", "highway/residential", "highway/unclassified"],
+ ferry: ["route/ferry", "route/ferry", "route/ferry"],
+ foot: ["highway/footway", "highway/footway", "highway/footway"],
+ hiking: ["highway/path", "highway/path", "highway/path"],
+ horse: ["highway/bridleway", "highway/bridleway", "highway/bridleway"],
+ light_rail: ["railway/light_rail", "railway/light_rail", "railway/light_rail"],
+ monorail: ["railway/monorail", "railway/monorail", "railway/monorail"],
+ mtb: ["highway/path", "highway/track", "highway/bridleway"],
+ pipeline: ["man_made/pipeline", "man_made/pipeline", "man_made/pipeline"],
+ piste: ["piste/downhill", "piste/hike", "piste/nordic"],
+ power: ["power/line", "power/line", "power/line"],
+ road: ["highway/secondary", "highway/primary", "highway/trunk"],
+ subway: ["railway/subway", "railway/subway", "railway/subway"],
+ train: ["railway/rail", "railway/rail", "railway/rail"],
+ tram: ["railway/tram", "railway/tram", "railway/tram"],
+ railway: ["railway/rail", "railway/rail", "railway/rail"],
+ waterway: ["waterway/stream", "waterway/stream", "waterway/stream"]
+ };
+ function render() {
+ let p2 = _preset.apply(this, arguments);
+ let geom = _geometry ? _geometry.apply(this, arguments) : null;
+ if (geom === "relation" && p2.tags && (p2.tags.type === "route" && p2.tags.route && routeSegments[p2.tags.route] || p2.tags.type === "waterway")) {
+ geom = "route";
}
- var photoOverlaysUsed = context.history().photoOverlaysUsed();
- if (photoOverlaysUsed.length) {
- var sources = (tags.source || "").split(";");
- if (sources.indexOf("streetlevel imagery") === -1) {
- sources.push("streetlevel imagery");
+ const showThirdPartyIcons = corePreferences("preferences.privacy.thirdpartyicons") || "true";
+ const isFallback = p2.isFallback && p2.isFallback();
+ const imageURL = showThirdPartyIcons === "true" && p2.imageURL;
+ const picon = getIcon(p2, geom);
+ const isCategory = !p2.setTags;
+ const drawPoint = false;
+ const drawVertex = picon !== null && geom === "vertex";
+ const drawLine = picon && geom === "line" && !isFallback && !isCategory;
+ const drawArea = picon && geom === "area" && !isFallback && !isCategory;
+ const drawRoute = picon && geom === "route";
+ const isFramed = drawVertex || drawArea || drawLine || drawRoute || isCategory;
+ let tags = !isCategory ? p2.setTags({}, geom) : {};
+ for (let k2 in tags) {
+ if (tags[k2] === "*") {
+ tags[k2] = "yes";
}
- photoOverlaysUsed.forEach(function(photoOverlay) {
- if (sources.indexOf(photoOverlay) === -1) {
- sources.push(photoOverlay);
- }
- });
- tags.source = context.cleanTagValue(sources.join(";"));
}
- context.changeset = new osmChangeset({ tags });
+ let tagClasses = svgTagClasses().getClassesString(tags, "");
+ let selection2 = select_default2(this);
+ let container = selection2.selectAll(".preset-icon-container").data([0]);
+ container = container.enter().append("div").attr("class", "preset-icon-container").merge(container);
+ container.classed("showing-img", !!imageURL).classed("fallback", isFallback);
+ renderCategoryBorder(container, isCategory && p2);
+ renderPointBorder(container, drawPoint);
+ renderCircleFill(container, drawVertex);
+ renderSquareFill(container, drawArea, tagClasses);
+ renderLine(container, drawLine, tagClasses);
+ renderRoute(container, drawRoute, p2);
+ renderSvgIcon(container, picon, geom, isFramed, isCategory, tagClasses);
+ renderImageIcon(container, imageURL);
}
- function loadDerivedChangesetTags() {
- var osm = context.connection();
- if (!osm)
- return;
- var tags = Object.assign({}, context.changeset.tags);
- var imageryUsed = context.cleanTagValue(context.history().imageryUsed().join(";"));
- tags.imagery_used = imageryUsed || "None";
- var osmClosed = osm.getClosedIDs();
- var itemType;
- if (osmClosed.length) {
- tags["closed:note"] = context.cleanTagValue(osmClosed.join(";"));
- }
- if (services.keepRight) {
- var krClosed = services.keepRight.getClosedIDs();
- if (krClosed.length) {
- tags["closed:keepright"] = context.cleanTagValue(krClosed.join(";"));
- }
- }
- if (services.improveOSM) {
- var iOsmClosed = services.improveOSM.getClosedCounts();
- for (itemType in iOsmClosed) {
- tags["closed:improveosm:" + itemType] = context.cleanTagValue(iOsmClosed[itemType].toString());
- }
- }
- if (services.osmose) {
- var osmoseClosed = services.osmose.getClosedCounts();
- for (itemType in osmoseClosed) {
- tags["closed:osmose:" + itemType] = context.cleanTagValue(osmoseClosed[itemType].toString());
- }
+ presetIcon.preset = function(val) {
+ if (!arguments.length) return _preset;
+ _preset = utilFunctor(val);
+ return presetIcon;
+ };
+ presetIcon.geometry = function(val) {
+ if (!arguments.length) return _geometry;
+ _geometry = utilFunctor(val);
+ return presetIcon;
+ };
+ return presetIcon;
+ }
+
+ // modules/ui/sections/feature_type.js
+ function uiSectionFeatureType(context) {
+ var dispatch14 = dispatch_default("choose");
+ var _entityIDs = [];
+ var _presets = [];
+ var _tagReference;
+ var section = uiSection("feature-type", context).label(() => _t.append("inspector.feature_type")).disclosureContent(renderDisclosureContent);
+ function renderDisclosureContent(selection2) {
+ selection2.classed("preset-list-item", true);
+ selection2.classed("mixed-types", _presets.length > 1);
+ var presetButtonWrap = selection2.selectAll(".preset-list-button-wrap").data([0]).enter().append("div").attr("class", "preset-list-button-wrap");
+ var presetButton = presetButtonWrap.append("button").attr("class", "preset-list-button preset-reset").call(
+ uiTooltip().title(() => _t.append("inspector.back_tooltip")).placement("bottom")
+ );
+ presetButton.append("div").attr("class", "preset-icon-container");
+ presetButton.append("div").attr("class", "label").append("div").attr("class", "label-inner");
+ presetButtonWrap.append("div").attr("class", "accessory-buttons");
+ var tagReferenceBodyWrap = selection2.selectAll(".tag-reference-body-wrap").data([0]);
+ tagReferenceBodyWrap = tagReferenceBodyWrap.enter().append("div").attr("class", "tag-reference-body-wrap").merge(tagReferenceBodyWrap);
+ if (_tagReference) {
+ selection2.selectAll(".preset-list-button-wrap .accessory-buttons").style("display", _presets.length === 1 ? null : "none").call(_tagReference.button);
+ tagReferenceBodyWrap.style("display", _presets.length === 1 ? null : "none").call(_tagReference.body);
}
- for (var key in tags) {
- if (key.match(/(^warnings:)|(^resolved:)/)) {
- delete tags[key];
+ selection2.selectAll(".preset-reset").on("click", function() {
+ dispatch14.call("choose", this, _presets);
+ }).on("pointerdown pointerup mousedown mouseup", function(d3_event) {
+ d3_event.preventDefault();
+ d3_event.stopPropagation();
+ });
+ var geometries = entityGeometries();
+ selection2.select(".preset-list-item button").call(
+ uiPresetIcon().geometry(_presets.length === 1 ? geometries.length === 1 && geometries[0] : null).preset(_presets.length === 1 ? _presets[0] : _mainPresetIndex.item("point"))
+ );
+ var names = _presets.length === 1 ? [
+ _presets[0].nameLabel(),
+ _presets[0].subtitleLabel()
+ ].filter(Boolean) : [_t.append("inspector.multiple_types")];
+ var label = selection2.select(".label-inner");
+ var nameparts = label.selectAll(".namepart").data(names, (d2) => d2.stringId);
+ nameparts.exit().remove();
+ nameparts.enter().append("div").attr("class", "namepart").text("").each(function(d2) {
+ d2(select_default2(this));
+ });
+ }
+ section.entityIDs = function(val) {
+ if (!arguments.length) return _entityIDs;
+ _entityIDs = val;
+ return section;
+ };
+ section.presets = function(val) {
+ if (!arguments.length) return _presets;
+ if (!utilArrayIdentical(val, _presets)) {
+ _presets = val;
+ if (_presets.length === 1) {
+ _tagReference = uiTagReference(_presets[0].reference(), context).showing(false);
}
}
- function addIssueCounts(issues, prefix) {
- var issuesByType = utilArrayGroupBy(issues, "type");
- for (var issueType in issuesByType) {
- var issuesOfType = issuesByType[issueType];
- if (issuesOfType[0].subtype) {
- var issuesBySubtype = utilArrayGroupBy(issuesOfType, "subtype");
- for (var issueSubtype in issuesBySubtype) {
- var issuesOfSubtype = issuesBySubtype[issueSubtype];
- tags[prefix + ":" + issueType + ":" + issueSubtype] = context.cleanTagValue(issuesOfSubtype.length.toString());
- }
- } else {
- tags[prefix + ":" + issueType] = context.cleanTagValue(issuesOfType.length.toString());
- }
- }
+ return section;
+ };
+ function entityGeometries() {
+ var counts = {};
+ for (var i3 in _entityIDs) {
+ var geometry = context.graph().geometry(_entityIDs[i3]);
+ if (!counts[geometry]) counts[geometry] = 0;
+ counts[geometry] += 1;
}
- var warnings = context.validator().getIssuesBySeverity({ what: "edited", where: "all", includeIgnored: true, includeDisabledRules: true }).warning.filter(function(issue) {
- return issue.type !== "help_request";
+ return Object.keys(counts).sort(function(geom1, geom2) {
+ return counts[geom2] - counts[geom1];
});
- addIssueCounts(warnings, "warnings");
- var resolvedIssues = context.validator().getResolvedIssues();
- addIssueCounts(resolvedIssues, "resolved");
- context.changeset = context.changeset.update({ tags });
}
- function render(selection2) {
- var osm = context.connection();
- if (!osm)
- return;
- var header = selection2.selectAll(".header").data([0]);
- var headerTitle = header.enter().append("div").attr("class", "header fillL");
- headerTitle.append("div").append("h2").call(_t.append("commit.title"));
- headerTitle.append("button").attr("class", "close").attr("title", _t("icons.close")).on("click", function() {
- dispatch10.call("cancel", this);
- }).call(svgIcon("#iD-icon-close"));
- var body = selection2.selectAll(".body").data([0]);
- body = body.enter().append("div").attr("class", "body").merge(body);
- var changesetSection = body.selectAll(".changeset-editor").data([0]);
- changesetSection = changesetSection.enter().append("div").attr("class", "modal-section changeset-editor").merge(changesetSection);
- changesetSection.call(changesetEditor.changesetID(context.changeset.id).tags(context.changeset.tags));
- body.call(commitWarnings);
- var saveSection = body.selectAll(".save-section").data([0]);
- saveSection = saveSection.enter().append("div").attr("class", "modal-section save-section fillL").merge(saveSection);
- var prose = saveSection.selectAll(".commit-info").data([0]);
- if (prose.enter().size()) {
- _userDetails2 = null;
- }
- prose = prose.enter().append("p").attr("class", "commit-info").call(_t.append("commit.upload_explanation")).merge(prose);
- osm.userDetails(function(err, user) {
- if (err)
- return;
- if (_userDetails2 === user)
- return;
- _userDetails2 = user;
- var userLink = select_default2(document.createElement("div"));
- if (user.image_url) {
- userLink.append("img").attr("src", user.image_url).attr("class", "icon pre-text user-icon");
- }
- userLink.append("a").attr("class", "user-info").text(user.display_name).attr("href", osm.userURL(user.display_name)).attr("target", "_blank");
- prose.html(_t.html("commit.upload_explanation_with_user", { user: { html: userLink.html() } }));
+ return utilRebind(section, dispatch14, "on");
+ }
+
+ // modules/ui/form_fields.js
+ function uiFormFields(context) {
+ var moreCombo = uiCombobox(context, "more-fields").minItems(1);
+ var _fieldsArr = [];
+ var _lastPlaceholder = "";
+ var _state = "";
+ var _klass = "";
+ function formFields(selection2) {
+ var allowedFields = _fieldsArr.filter(function(field) {
+ return field.isAllowed();
});
- var requestReview = saveSection.selectAll(".request-review").data([0]);
- var requestReviewEnter = requestReview.enter().append("div").attr("class", "request-review");
- var requestReviewDomId = utilUniqueDomId("commit-input-request-review");
- var labelEnter = requestReviewEnter.append("label").attr("for", requestReviewDomId);
- if (!labelEnter.empty()) {
- labelEnter.call(uiTooltip().title(_t.html("commit.request_review_info")).placement("top"));
- }
- labelEnter.append("input").attr("type", "checkbox").attr("id", requestReviewDomId);
- labelEnter.append("span").call(_t.append("commit.request_review"));
- requestReview = requestReview.merge(requestReviewEnter);
- var requestReviewInput = requestReview.selectAll("input").property("checked", isReviewRequested(context.changeset.tags)).on("change", toggleRequestReview);
- var buttonSection = saveSection.selectAll(".buttons").data([0]);
- var buttonEnter = buttonSection.enter().append("div").attr("class", "buttons fillL");
- buttonEnter.append("button").attr("class", "secondary-action button cancel-button").append("span").attr("class", "label").call(_t.append("commit.cancel"));
- var uploadButton = buttonEnter.append("button").attr("class", "action button save-button");
- uploadButton.append("span").attr("class", "label").call(_t.append("commit.save"));
- var uploadBlockerTooltipText = getUploadBlockerMessage();
- buttonSection = buttonSection.merge(buttonEnter);
- buttonSection.selectAll(".cancel-button").on("click.cancel", function() {
- dispatch10.call("cancel", this);
+ var shown = allowedFields.filter(function(field) {
+ return field.isShown();
});
- buttonSection.selectAll(".save-button").classed("disabled", uploadBlockerTooltipText !== null).on("click.save", function() {
- if (!select_default2(this).classed("disabled")) {
- this.blur();
- for (var key in context.changeset.tags) {
- if (!key)
- delete context.changeset.tags[key];
- }
- context.uploader().save(context.changeset);
- }
+ var notShown = allowedFields.filter(function(field) {
+ return !field.isShown();
+ }).sort(function(a2, b2) {
+ return a2.universal === b2.universal ? 0 : a2.universal ? 1 : -1;
});
- uiTooltip().destroyAny(buttonSection.selectAll(".save-button"));
- if (uploadBlockerTooltipText) {
- buttonSection.selectAll(".save-button").call(uiTooltip().title(uploadBlockerTooltipText).placement("top"));
- }
- var tagSection = body.selectAll(".tag-section.raw-tag-editor").data([0]);
- tagSection = tagSection.enter().append("div").attr("class", "modal-section tag-section raw-tag-editor").merge(tagSection);
- tagSection.call(rawTagEditor.tags(Object.assign({}, context.changeset.tags)).render);
- var changesSection = body.selectAll(".commit-changes-section").data([0]);
- changesSection = changesSection.enter().append("div").attr("class", "modal-section commit-changes-section").merge(changesSection);
- changesSection.call(commitChanges.render);
- function toggleRequestReview() {
- var rr = requestReviewInput.property("checked");
- updateChangeset({ review_requested: rr ? "yes" : void 0 });
- tagSection.call(rawTagEditor.tags(Object.assign({}, context.changeset.tags)).render);
- }
- }
- function getUploadBlockerMessage() {
- var errors = context.validator().getIssuesBySeverity({ what: "edited", where: "all" }).error;
- if (errors.length) {
- return _t("commit.outstanding_errors_message", { count: errors.length });
- } else {
- var hasChangesetComment = context.changeset && context.changeset.tags.comment && context.changeset.tags.comment.trim().length;
- if (!hasChangesetComment) {
- return _t("commit.comment_needed_message");
- }
+ var container = selection2.selectAll(".form-fields-container").data([0]);
+ container = container.enter().append("div").attr("class", "form-fields-container " + (_klass || "")).merge(container);
+ var fields = container.selectAll(".wrap-form-field").data(shown, function(d2) {
+ return d2.id + (d2.entityIDs ? d2.entityIDs.join() : "");
+ });
+ fields.exit().remove();
+ var enter = fields.enter().append("div").attr("class", function(d2) {
+ return "wrap-form-field wrap-form-field-" + d2.safeid;
+ });
+ fields = fields.merge(enter);
+ fields.order().each(function(d2) {
+ select_default2(this).call(d2.render);
+ });
+ var titles = [];
+ var moreFields = notShown.map(function(field) {
+ var title = field.title();
+ titles.push(title);
+ var terms = field.terms();
+ if (field.key) terms.push(field.key);
+ if (field.keys) terms = terms.concat(field.keys);
+ return {
+ display: field.label(),
+ value: title,
+ title,
+ field,
+ terms
+ };
+ });
+ var placeholder = titles.slice(0, 3).join(", ") + (titles.length > 3 ? "\u2026" : "");
+ var more = selection2.selectAll(".more-fields").data(_state === "hover" || moreFields.length === 0 ? [] : [0]);
+ more.exit().remove();
+ var moreEnter = more.enter().append("div").attr("class", "more-fields").append("label");
+ moreEnter.append("span").call(_t.append("inspector.add_fields"));
+ more = moreEnter.merge(more);
+ var input = more.selectAll(".value").data([0]);
+ input.exit().remove();
+ input = input.enter().append("input").attr("class", "value").attr("type", "text").attr("placeholder", placeholder).call(utilNoAuto).merge(input);
+ input.call(utilGetSetValue, "").call(
+ moreCombo.data(moreFields).on("accept", function(d2) {
+ if (!d2) return;
+ var field = d2.field;
+ field.show();
+ selection2.call(formFields);
+ field.focus();
+ })
+ );
+ if (_lastPlaceholder !== placeholder) {
+ input.attr("placeholder", placeholder);
+ _lastPlaceholder = placeholder;
}
- return null;
}
- function changeTags(_, changed, onInput) {
- if (changed.hasOwnProperty("comment")) {
- if (changed.comment === void 0) {
- changed.comment = "";
- }
- if (!onInput) {
- corePreferences("comment", changed.comment);
- corePreferences("commentDate", Date.now());
- }
- }
- if (changed.hasOwnProperty("source")) {
- if (changed.source === void 0) {
- corePreferences("source", null);
- } else if (!onInput) {
- corePreferences("source", changed.source);
- corePreferences("commentDate", Date.now());
+ formFields.fieldsArr = function(val) {
+ if (!arguments.length) return _fieldsArr;
+ _fieldsArr = val || [];
+ return formFields;
+ };
+ formFields.state = function(val) {
+ if (!arguments.length) return _state;
+ _state = val;
+ return formFields;
+ };
+ formFields.klass = function(val) {
+ if (!arguments.length) return _klass;
+ _klass = val;
+ return formFields;
+ };
+ return formFields;
+ }
+
+ // modules/ui/sections/preset_fields.js
+ function uiSectionPresetFields(context) {
+ var section = uiSection("preset-fields", context).label(() => _t.append("inspector.fields")).disclosureContent(renderDisclosureContent);
+ var dispatch14 = dispatch_default("change", "revert");
+ var formFields = uiFormFields(context);
+ var _state;
+ var _fieldsArr;
+ var _presets = [];
+ var _tags;
+ var _entityIDs;
+ function renderDisclosureContent(selection2) {
+ if (!_fieldsArr) {
+ var graph = context.graph();
+ var geometries = Object.keys(_entityIDs.reduce(function(geoms, entityID) {
+ geoms[graph.entity(entityID).geometry(graph)] = true;
+ return geoms;
+ }, {}));
+ const loc = _entityIDs.reduce(function(extent, entityID) {
+ var entity = context.graph().entity(entityID);
+ return extent.extend(entity.extent(context.graph()));
+ }, geoExtent()).center();
+ var presetsManager = _mainPresetIndex;
+ var allFields = [];
+ var allMoreFields = [];
+ var sharedTotalFields;
+ _presets.forEach(function(preset) {
+ var fields = preset.fields(loc);
+ var moreFields = preset.moreFields(loc);
+ allFields = utilArrayUnion(allFields, fields);
+ allMoreFields = utilArrayUnion(allMoreFields, moreFields);
+ if (!sharedTotalFields) {
+ sharedTotalFields = utilArrayUnion(fields, moreFields);
+ } else {
+ sharedTotalFields = sharedTotalFields.filter(function(field) {
+ return fields.indexOf(field) !== -1 || moreFields.indexOf(field) !== -1;
+ });
+ }
+ });
+ var sharedFields = allFields.filter(function(field) {
+ return sharedTotalFields.indexOf(field) !== -1;
+ });
+ var sharedMoreFields = allMoreFields.filter(function(field) {
+ return sharedTotalFields.indexOf(field) !== -1;
+ });
+ _fieldsArr = [];
+ sharedFields.forEach(function(field) {
+ if (field.matchAllGeometry(geometries)) {
+ _fieldsArr.push(
+ uiField(context, field, _entityIDs)
+ );
+ }
+ });
+ var singularEntity = _entityIDs.length === 1 && graph.hasEntity(_entityIDs[0]);
+ if (singularEntity && singularEntity.isHighwayIntersection(graph) && presetsManager.field("restrictions")) {
+ _fieldsArr.push(
+ uiField(context, presetsManager.field("restrictions"), _entityIDs)
+ );
}
+ var additionalFields = utilArrayUnion(sharedMoreFields, presetsManager.universal());
+ additionalFields.sort(function(field1, field2) {
+ return field1.title().localeCompare(field2.title(), _mainLocalizer.localeCode());
+ });
+ additionalFields.forEach(function(field) {
+ if (sharedFields.indexOf(field) === -1 && field.matchAllGeometry(geometries)) {
+ _fieldsArr.push(
+ uiField(context, field, _entityIDs, { show: false })
+ );
+ }
+ });
+ _fieldsArr.forEach(function(field) {
+ field.on("change", function(t2, onInput) {
+ dispatch14.call("change", field, _entityIDs, t2, onInput);
+ }).on("revert", function(keys2) {
+ dispatch14.call("revert", field, keys2);
+ });
+ });
}
- updateChangeset(changed, onInput);
- if (_selection) {
- _selection.call(render);
- }
+ _fieldsArr.forEach(function(field) {
+ field.state(_state).tags(_tags);
+ });
+ selection2.call(
+ formFields.fieldsArr(_fieldsArr).state(_state).klass("grouped-items-area")
+ );
}
- function findHashtags(tags, commentOnly) {
- var detectedHashtags = commentHashtags();
- if (detectedHashtags.length) {
- corePreferences("hashtags", null);
+ section.presets = function(val) {
+ if (!arguments.length) return _presets;
+ if (!_presets || !val || !utilArrayIdentical(_presets, val)) {
+ _presets = val;
+ _fieldsArr = null;
}
- if (!detectedHashtags.length || !commentOnly) {
- detectedHashtags = detectedHashtags.concat(hashtagHashtags());
+ return section;
+ };
+ section.state = function(val) {
+ if (!arguments.length) return _state;
+ _state = val;
+ return section;
+ };
+ section.tags = function(val) {
+ if (!arguments.length) return _tags;
+ _tags = val;
+ return section;
+ };
+ section.entityIDs = function(val) {
+ if (!arguments.length) return _entityIDs;
+ if (!val || !_entityIDs || !utilArrayIdentical(_entityIDs, val)) {
+ _entityIDs = val;
+ _fieldsArr = null;
}
- var allLowerCase = /* @__PURE__ */ new Set();
- return detectedHashtags.filter(function(hashtag) {
- var lowerCase = hashtag.toLowerCase();
- if (!allLowerCase.has(lowerCase)) {
- allLowerCase.add(lowerCase);
- return true;
- }
- return false;
+ return section;
+ };
+ return utilRebind(section, dispatch14, "on");
+ }
+
+ // modules/ui/sections/raw_member_editor.js
+ function uiSectionRawMemberEditor(context) {
+ var section = uiSection("raw-member-editor", context).shouldDisplay(function() {
+ if (!_entityIDs || _entityIDs.length !== 1) return false;
+ var entity = context.hasEntity(_entityIDs[0]);
+ return entity && entity.type === "relation";
+ }).label(function() {
+ var entity = context.hasEntity(_entityIDs[0]);
+ if (!entity) return "";
+ var gt2 = entity.members.length > _maxMembers ? ">" : "";
+ var count = gt2 + entity.members.slice(0, _maxMembers).length;
+ return _t.append("inspector.title_count", { title: _t("inspector.members"), count });
+ }).disclosureContent(renderDisclosureContent);
+ var taginfo = services.taginfo;
+ var _entityIDs;
+ var _maxMembers = 1e3;
+ function downloadMember(d3_event, d2) {
+ d3_event.preventDefault();
+ select_default2(this).classed("loading", true);
+ context.loadEntity(d2.id, function() {
+ section.reRender();
});
- function commentHashtags() {
- var matches = (tags.comment || "").replace(/http\S*/g, "").match(hashtagRegex);
- return matches || [];
+ }
+ function zoomToMember(d3_event, d2) {
+ d3_event.preventDefault();
+ var entity = context.entity(d2.id);
+ context.map().zoomToEase(entity);
+ utilHighlightEntities([d2.id], true, context);
+ }
+ function selectMember(d3_event, d2) {
+ d3_event.preventDefault();
+ utilHighlightEntities([d2.id], false, context);
+ var entity = context.entity(d2.id);
+ var mapExtent = context.map().extent();
+ if (!entity.intersects(mapExtent, context.graph())) {
+ context.map().zoomToEase(entity);
}
- function hashtagHashtags() {
- var matches = (tags.hashtags || "").split(/[,;\s]+/).map(function(s) {
- if (s[0] !== "#") {
- s = "#" + s;
- }
- var matched = s.match(hashtagRegex);
- return matched && matched[0];
- }).filter(Boolean);
- return matches || [];
+ context.enter(modeSelect(context, [d2.id]));
+ }
+ function changeRole(d3_event, d2) {
+ var oldRole = d2.role;
+ var newRole = context.cleanRelationRole(select_default2(this).property("value"));
+ if (oldRole !== newRole) {
+ var member = { id: d2.id, type: d2.type, role: newRole };
+ context.perform(
+ actionChangeMember(d2.relation.id, member, d2.index),
+ _t("operations.change_role.annotation", {
+ n: 1
+ })
+ );
+ context.validator().validate();
}
}
- function isReviewRequested(tags) {
- var rr = tags.review_requested;
- if (rr === void 0)
- return false;
- rr = rr.trim().toLowerCase();
- return !(rr === "" || rr === "no");
+ function deleteMember(d3_event, d2) {
+ utilHighlightEntities([d2.id], false, context);
+ context.perform(
+ actionDeleteMember(d2.relation.id, d2.index),
+ _t("operations.delete_member.annotation", {
+ n: 1
+ })
+ );
+ if (!context.hasEntity(d2.relation.id)) {
+ context.enter(modeBrowse(context));
+ } else {
+ context.validator().validate();
+ }
}
- function updateChangeset(changed, onInput) {
- var tags = Object.assign({}, context.changeset.tags);
- Object.keys(changed).forEach(function(k) {
- var v = changed[k];
- k = context.cleanTagKey(k);
- if (readOnlyTags.indexOf(k) !== -1)
- return;
- if (v === void 0) {
- delete tags[k];
- } else if (onInput) {
- tags[k] = v;
- } else {
- tags[k] = context.cleanTagValue(v);
- }
+ function renderDisclosureContent(selection2) {
+ var entityID = _entityIDs[0];
+ var memberships = [];
+ var entity = context.entity(entityID);
+ entity.members.slice(0, _maxMembers).forEach(function(member, index) {
+ memberships.push({
+ index,
+ id: member.id,
+ type: member.type,
+ role: member.role,
+ relation: entity,
+ member: context.hasEntity(member.id),
+ domId: utilUniqueDomId(entityID + "-member-" + index)
+ });
});
- if (!onInput) {
- var commentOnly = changed.hasOwnProperty("comment") && changed.comment !== "";
- var arr = findHashtags(tags, commentOnly);
- if (arr.length) {
- tags.hashtags = context.cleanTagValue(arr.join(";"));
- corePreferences("hashtags", tags.hashtags);
+ var list2 = selection2.selectAll(".member-list").data([0]);
+ list2 = list2.enter().append("ul").attr("class", "member-list").merge(list2);
+ var items = list2.selectAll("li").data(memberships, function(d2) {
+ return osmEntity.key(d2.relation) + "," + d2.index + "," + (d2.member ? osmEntity.key(d2.member) : "incomplete");
+ });
+ items.exit().each(unbind).remove();
+ var itemsEnter = items.enter().append("li").attr("class", "member-row form-field").classed("member-incomplete", function(d2) {
+ return !d2.member;
+ });
+ itemsEnter.each(function(d2) {
+ var item = select_default2(this);
+ var label = item.append("label").attr("class", "field-label").attr("for", d2.domId);
+ if (d2.member) {
+ item.on("mouseover", function() {
+ utilHighlightEntities([d2.id], true, context);
+ }).on("mouseout", function() {
+ utilHighlightEntities([d2.id], false, context);
+ });
+ var labelLink = label.append("span").attr("class", "label-text").append("a").attr("href", "#").on("click", selectMember);
+ labelLink.append("span").attr("class", "member-entity-type").text(function(d4) {
+ var matched = _mainPresetIndex.match(d4.member, context.graph());
+ return matched && matched.name() || utilDisplayType(d4.member.id);
+ });
+ labelLink.append("span").attr("class", "member-entity-name").classed("has-colour", (d4) => d4.member.type === "relation" && d4.member.tags.colour && isColourValid(d4.member.tags.colour)).style("border-color", (d4) => d4.member.type === "relation" && d4.member.tags.colour).text(function(d4) {
+ return utilDisplayName(d4.member);
+ });
+ label.append("button").attr("title", _t("icons.remove")).attr("class", "remove member-delete").call(svgIcon("#iD-operation-delete"));
+ label.append("button").attr("class", "member-zoom").attr("title", _t("icons.zoom_to")).call(svgIcon("#iD-icon-framed-dot", "monochrome")).on("click", zoomToMember);
} else {
- delete tags.hashtags;
- corePreferences("hashtags", null);
+ var labelText = label.append("span").attr("class", "label-text");
+ labelText.append("span").attr("class", "member-entity-type").call(_t.append("inspector." + d2.type, { id: d2.id }));
+ labelText.append("span").attr("class", "member-entity-name").call(_t.append("inspector.incomplete", { id: d2.id }));
+ label.append("button").attr("class", "member-download").attr("title", _t("icons.download")).call(svgIcon("#iD-icon-load")).on("click", downloadMember);
}
+ });
+ var wrapEnter = itemsEnter.append("div").attr("class", "form-field-input-wrap form-field-input-member");
+ wrapEnter.append("input").attr("class", "member-role").attr("id", function(d2) {
+ return d2.domId;
+ }).property("type", "text").attr("placeholder", _t("inspector.role")).call(utilNoAuto);
+ if (taginfo) {
+ wrapEnter.each(bindTypeahead);
}
- if (_userDetails2 && _userDetails2.changesets_count !== void 0) {
- var changesetsCount = parseInt(_userDetails2.changesets_count, 10) + 1;
- tags.changesets_count = String(changesetsCount);
- if (changesetsCount <= 100) {
- var s;
- s = corePreferences("walkthrough_completed");
- if (s) {
- tags["ideditor:walkthrough_completed"] = s;
- }
- s = corePreferences("walkthrough_progress");
- if (s) {
- tags["ideditor:walkthrough_progress"] = s;
+ items = items.merge(itemsEnter).order();
+ items.select("input.member-role").property("value", function(d2) {
+ return d2.role;
+ }).on("blur", changeRole).on("change", changeRole);
+ items.select("button.member-delete").on("click", deleteMember);
+ var dragOrigin, targetIndex;
+ items.call(
+ drag_default().on("start", function(d3_event) {
+ dragOrigin = {
+ x: d3_event.x,
+ y: d3_event.y
+ };
+ targetIndex = null;
+ }).on("drag", function(d3_event) {
+ var x2 = d3_event.x - dragOrigin.x, y2 = d3_event.y - dragOrigin.y;
+ if (!select_default2(this).classed("dragging") && // don't display drag until dragging beyond a distance threshold
+ Math.sqrt(Math.pow(x2, 2) + Math.pow(y2, 2)) <= 5) return;
+ var index = items.nodes().indexOf(this);
+ select_default2(this).classed("dragging", true);
+ targetIndex = null;
+ selection2.selectAll("li.member-row").style("transform", function(d2, index2) {
+ var node = select_default2(this).node();
+ if (index === index2) {
+ return "translate(" + x2 + "px, " + y2 + "px)";
+ } else if (index2 > index && d3_event.y > node.offsetTop) {
+ if (targetIndex === null || index2 > targetIndex) {
+ targetIndex = index2;
+ }
+ return "translateY(-100%)";
+ } else if (index2 < index && d3_event.y < node.offsetTop + node.offsetHeight) {
+ if (targetIndex === null || index2 < targetIndex) {
+ targetIndex = index2;
+ }
+ return "translateY(100%)";
+ }
+ return null;
+ });
+ }).on("end", function(d3_event, d2) {
+ if (!select_default2(this).classed("dragging")) return;
+ var index = items.nodes().indexOf(this);
+ select_default2(this).classed("dragging", false);
+ selection2.selectAll("li.member-row").style("transform", null);
+ if (targetIndex !== null) {
+ context.perform(
+ actionMoveMember(d2.relation.id, index, targetIndex),
+ _t("operations.reorder_members.annotation")
+ );
+ context.validator().validate();
}
- s = corePreferences("walkthrough_started");
- if (s) {
- tags["ideditor:walkthrough_started"] = s;
+ })
+ );
+ function bindTypeahead(d2) {
+ var row = select_default2(this);
+ var role = row.selectAll("input.member-role");
+ var origValue = role.property("value");
+ function sort(value, data) {
+ var sameletter = [];
+ var other2 = [];
+ for (var i3 = 0; i3 < data.length; i3++) {
+ if (data[i3].value.substring(0, value.length) === value) {
+ sameletter.push(data[i3]);
+ } else {
+ other2.push(data[i3]);
+ }
}
+ return sameletter.concat(other2);
}
- } else {
- delete tags.changesets_count;
+ role.call(
+ uiCombobox(context, "member-role").fetcher(function(role2, callback) {
+ var geometry;
+ if (d2.member) {
+ geometry = context.graph().geometry(d2.member.id);
+ } else if (d2.type === "relation") {
+ geometry = "relation";
+ } else if (d2.type === "way") {
+ geometry = "line";
+ } else {
+ geometry = "point";
+ }
+ var rtype = entity.tags.type;
+ taginfo.roles({
+ debounce: true,
+ rtype: rtype || "",
+ geometry,
+ query: role2
+ }, function(err, data) {
+ if (!err) callback(sort(role2, data));
+ });
+ }).on("cancel", function() {
+ role.property("value", origValue);
+ })
+ );
}
- if (!(0, import_fast_deep_equal9.default)(context.changeset.tags, tags)) {
- context.changeset = context.changeset.update({ tags });
+ function unbind() {
+ var row = select_default2(this);
+ row.selectAll("input.member-role").call(uiCombobox.off, context);
}
}
- commit.reset = function() {
- context.changeset = null;
+ section.entityIDs = function(val) {
+ if (!arguments.length) return _entityIDs;
+ _entityIDs = val;
+ return section;
};
- return utilRebind(commit, dispatch10, "on");
+ return section;
}
- // modules/ui/confirm.js
- function uiConfirm(selection2) {
- var modalSelection = uiModal(selection2);
- modalSelection.select(".modal").classed("modal-alert", true);
- var section = modalSelection.select(".content");
- section.append("div").attr("class", "modal-section header");
- section.append("div").attr("class", "modal-section message-text");
- var buttons = section.append("div").attr("class", "modal-section buttons cf");
- modalSelection.okButton = function() {
- buttons.append("button").attr("class", "button ok-button action").on("click.confirm", function() {
- modalSelection.remove();
- }).call(_t.append("confirm.okay")).node().focus();
- return modalSelection;
+ // modules/actions/delete_members.js
+ function actionDeleteMembers(relationId, memberIndexes) {
+ return function(graph) {
+ memberIndexes.sort((a2, b2) => b2 - a2);
+ for (var i3 in memberIndexes) {
+ graph = actionDeleteMember(relationId, memberIndexes[i3])(graph);
+ }
+ return graph;
};
- return modalSelection;
}
- // modules/ui/conflicts.js
- function uiConflicts(context) {
- var dispatch10 = dispatch_default("cancel", "save");
- var keybinding = utilKeybinding("conflicts");
- var _origChanges;
- var _conflictList;
- var _shownConflictIndex;
- function keybindingOn() {
- select_default2(document).call(keybinding.on("\u238B", cancel, true));
+ // modules/ui/sections/raw_membership_editor.js
+ function uiSectionRawMembershipEditor(context) {
+ var section = uiSection("raw-membership-editor", context).shouldDisplay(function() {
+ return _entityIDs && _entityIDs.length;
+ }).label(function() {
+ var parents = getSharedParentRelations();
+ var gt2 = parents.length > _maxMemberships ? ">" : "";
+ var count = gt2 + parents.slice(0, _maxMemberships).length;
+ return _t.append("inspector.title_count", { title: _t("inspector.relations"), count });
+ }).disclosureContent(renderDisclosureContent);
+ var taginfo = services.taginfo;
+ var nearbyCombo = uiCombobox(context, "parent-relation").minItems(1).fetcher(fetchNearbyRelations).itemsMouseEnter(function(d3_event, d2) {
+ if (d2.relation) utilHighlightEntities([d2.relation.id], true, context);
+ }).itemsMouseLeave(function(d3_event, d2) {
+ if (d2.relation) utilHighlightEntities([d2.relation.id], false, context);
+ });
+ var _inChange = false;
+ var _entityIDs = [];
+ var _showBlank;
+ var _maxMemberships = 1e3;
+ function getSharedParentRelations() {
+ var parents = [];
+ for (var i3 = 0; i3 < _entityIDs.length; i3++) {
+ var entity = context.graph().hasEntity(_entityIDs[i3]);
+ if (!entity) continue;
+ if (i3 === 0) {
+ parents = context.graph().parentRelations(entity);
+ } else {
+ parents = utilArrayIntersection(parents, context.graph().parentRelations(entity));
+ }
+ if (!parents.length) break;
+ }
+ return parents;
}
- function keybindingOff() {
- select_default2(document).call(keybinding.unbind);
+ function getMemberships() {
+ var memberships = [];
+ var relations = getSharedParentRelations().slice(0, _maxMemberships);
+ var isMultiselect = _entityIDs.length > 1;
+ var i3, relation, membership, index, member, indexedMember;
+ for (i3 = 0; i3 < relations.length; i3++) {
+ relation = relations[i3];
+ membership = {
+ relation,
+ members: [],
+ hash: osmEntity.key(relation)
+ };
+ for (index = 0; index < relation.members.length; index++) {
+ member = relation.members[index];
+ if (_entityIDs.indexOf(member.id) !== -1) {
+ indexedMember = Object.assign({}, member, { index });
+ membership.members.push(indexedMember);
+ membership.hash += "," + index.toString();
+ if (!isMultiselect) {
+ memberships.push(membership);
+ membership = {
+ relation,
+ members: [],
+ hash: osmEntity.key(relation)
+ };
+ }
+ }
+ }
+ if (membership.members.length) memberships.push(membership);
+ }
+ memberships.forEach(function(membership2) {
+ membership2.domId = utilUniqueDomId("membership-" + membership2.relation.id);
+ var roles = [];
+ membership2.members.forEach(function(member2) {
+ if (roles.indexOf(member2.role) === -1) roles.push(member2.role);
+ });
+ membership2.role = roles.length === 1 ? roles[0] : roles;
+ });
+ return memberships;
}
- function tryAgain() {
- keybindingOff();
- dispatch10.call("save");
+ function selectRelation(d3_event, d2) {
+ d3_event.preventDefault();
+ utilHighlightEntities([d2.relation.id], false, context);
+ context.enter(modeSelect(context, [d2.relation.id]));
}
- function cancel() {
- keybindingOff();
- dispatch10.call("cancel");
+ function zoomToRelation(d3_event, d2) {
+ d3_event.preventDefault();
+ var entity = context.entity(d2.relation.id);
+ context.map().zoomToEase(entity);
+ utilHighlightEntities([d2.relation.id], true, context);
}
- function conflicts(selection2) {
- keybindingOn();
- var headerEnter = selection2.selectAll(".header").data([0]).enter().append("div").attr("class", "header fillL");
- headerEnter.append("button").attr("class", "fr").attr("title", _t("icons.close")).on("click", cancel).call(svgIcon("#iD-icon-close"));
- headerEnter.append("h2").call(_t.append("save.conflict.header"));
- var bodyEnter = selection2.selectAll(".body").data([0]).enter().append("div").attr("class", "body fillL");
- var conflictsHelpEnter = bodyEnter.append("div").attr("class", "conflicts-help").call(_t.append("save.conflict.help"));
- var changeset = new osmChangeset();
- delete changeset.id;
- var data = JXON.stringify(changeset.osmChangeJXON(_origChanges));
- var blob = new Blob([data], { type: "text/xml;charset=utf-8;" });
- var fileName = "changes.osc";
- var linkEnter = conflictsHelpEnter.selectAll(".download-changes").append("a").attr("class", "download-changes");
- linkEnter.attr("href", window.URL.createObjectURL(blob)).attr("download", fileName);
- linkEnter.call(svgIcon("#iD-icon-load", "inline")).append("span").call(_t.append("save.conflict.download_changes"));
- bodyEnter.append("div").attr("class", "conflict-container fillL3").call(showConflict, 0);
- bodyEnter.append("div").attr("class", "conflicts-done").attr("opacity", 0).style("display", "none").call(_t.append("save.conflict.done"));
- var buttonsEnter = bodyEnter.append("div").attr("class", "buttons col12 joined conflicts-buttons");
- buttonsEnter.append("button").attr("disabled", _conflictList.length > 1).attr("class", "action conflicts-button col6").call(_t.append("save.title")).on("click.try_again", tryAgain);
- buttonsEnter.append("button").attr("class", "secondary-action conflicts-button col6").call(_t.append("confirm.cancel")).on("click.cancel", cancel);
+ function changeRole(d3_event, d2) {
+ if (d2 === 0) return;
+ if (_inChange) return;
+ var newRole = context.cleanRelationRole(select_default2(this).property("value"));
+ if (!newRole.trim() && typeof d2.role !== "string") return;
+ var membersToUpdate = d2.members.filter(function(member) {
+ return member.role !== newRole;
+ });
+ if (membersToUpdate.length) {
+ _inChange = true;
+ context.perform(
+ function actionChangeMemberRoles(graph) {
+ membersToUpdate.forEach(function(member) {
+ var newMember = Object.assign({}, member, { role: newRole });
+ delete newMember.index;
+ graph = actionChangeMember(d2.relation.id, newMember, member.index)(graph);
+ });
+ return graph;
+ },
+ _t("operations.change_role.annotation", {
+ n: membersToUpdate.length
+ })
+ );
+ context.validator().validate();
+ }
+ _inChange = false;
}
- function showConflict(selection2, index) {
- index = utilWrap(index, _conflictList.length);
- _shownConflictIndex = index;
- var parent = select_default2(selection2.node().parentNode);
- if (index === _conflictList.length - 1) {
- window.setTimeout(function() {
- parent.select(".conflicts-button").attr("disabled", null);
- parent.select(".conflicts-done").transition().attr("opacity", 1).style("display", "block");
- }, 250);
+ function addMembership(d2, role) {
+ _showBlank = false;
+ function actionAddMembers(relationId, ids, role2) {
+ return function(graph) {
+ for (var i3 in ids) {
+ var member = { id: ids[i3], type: graph.entity(ids[i3]).type, role: role2 };
+ graph = actionAddMember(relationId, member)(graph);
+ }
+ return graph;
+ };
+ }
+ if (d2.relation) {
+ context.perform(
+ actionAddMembers(d2.relation.id, _entityIDs, role),
+ _t("operations.add_member.annotation", {
+ n: _entityIDs.length
+ })
+ );
+ context.validator().validate();
+ } else {
+ var relation = osmRelation();
+ context.perform(
+ actionAddEntity(relation),
+ actionAddMembers(relation.id, _entityIDs, role),
+ _t("operations.add.annotation.relation")
+ );
+ context.enter(modeSelect(context, [relation.id]).newFeature(true));
}
- var conflict = selection2.selectAll(".conflict").data([_conflictList[index]]);
- conflict.exit().remove();
- var conflictEnter = conflict.enter().append("div").attr("class", "conflict");
- conflictEnter.append("h4").attr("class", "conflict-count").call(_t.append("save.conflict.count", { num: index + 1, total: _conflictList.length }));
- conflictEnter.append("a").attr("class", "conflict-description").attr("href", "#").text(function(d) {
- return d.name;
- }).on("click", function(d3_event, d) {
- d3_event.preventDefault();
- zoomToEntity(d.id);
- });
- var details = conflictEnter.append("div").attr("class", "conflict-detail-container");
- details.append("ul").attr("class", "conflict-detail-list").selectAll("li").data(function(d) {
- return d.details || [];
- }).enter().append("li").attr("class", "conflict-detail-item").html(function(d) {
- return d;
- });
- details.append("div").attr("class", "conflict-choices").call(addChoices);
- details.append("div").attr("class", "conflict-nav-buttons joined cf").selectAll("button").data(["previous", "next"]).enter().append("button").html(function(d) {
- return _t.html("save.conflict." + d);
- }).attr("class", "conflict-nav-button action col6").attr("disabled", function(d, i2) {
- return i2 === 0 && index === 0 || i2 === 1 && index === _conflictList.length - 1 || null;
- }).on("click", function(d3_event, d) {
- d3_event.preventDefault();
- var container = parent.selectAll(".conflict-container");
- var sign2 = d === "previous" ? -1 : 1;
- container.selectAll(".conflict").remove();
- container.call(showConflict, index + sign2);
- });
}
- function addChoices(selection2) {
- var choices = selection2.append("ul").attr("class", "layer-list").selectAll("li").data(function(d) {
- return d.choices || [];
- });
- var choicesEnter = choices.enter().append("li").attr("class", "layer");
- var labelEnter = choicesEnter.append("label");
- labelEnter.append("input").attr("type", "radio").attr("name", function(d) {
- return d.id;
- }).on("change", function(d3_event, d) {
- var ul = this.parentNode.parentNode.parentNode;
- ul.__data__.chosen = d.id;
- choose(d3_event, ul, d);
- });
- labelEnter.append("span").text(function(d) {
- return d.text;
- });
- choicesEnter.merge(choices).each(function(d) {
- var ul = this.parentNode;
- if (ul.__data__.chosen === d.id) {
- choose(null, ul, d);
- }
+ function downloadMembers(d3_event, d2) {
+ d3_event.preventDefault();
+ const button = select_default2(this);
+ button.classed("loading", true);
+ context.loadEntity(d2.relation.id, function() {
+ section.reRender();
});
}
- function choose(d3_event, ul, datum2) {
- if (d3_event)
- d3_event.preventDefault();
- select_default2(ul).selectAll("li").classed("active", function(d) {
- return d === datum2;
- }).selectAll("input").property("checked", function(d) {
- return d === datum2;
+ function deleteMembership(d3_event, d2) {
+ this.blur();
+ if (d2 === 0) return;
+ utilHighlightEntities([d2.relation.id], false, context);
+ var indexes = d2.members.map(function(member) {
+ return member.index;
});
- var extent = geoExtent();
- var entity;
- entity = context.graph().hasEntity(datum2.id);
- if (entity)
- extent._extend(entity.extent(context.graph()));
- datum2.action();
- entity = context.graph().hasEntity(datum2.id);
- if (entity)
- extent._extend(entity.extent(context.graph()));
- zoomToEntity(datum2.id, extent);
+ context.perform(
+ actionDeleteMembers(d2.relation.id, indexes),
+ _t("operations.delete_member.annotation", {
+ n: _entityIDs.length
+ })
+ );
+ context.validator().validate();
}
- function zoomToEntity(id2, extent) {
- context.surface().selectAll(".hover").classed("hover", false);
- var entity = context.graph().hasEntity(id2);
- if (entity) {
- if (extent) {
- context.map().trimmedExtent(extent);
- } else {
- context.map().zoomToEase(entity);
- }
- context.surface().selectAll(utilEntityOrMemberSelector([entity.id], context.graph())).classed("hover", true);
+ function fetchNearbyRelations(q2, callback) {
+ var newRelation = {
+ relation: null,
+ value: _t("inspector.new_relation"),
+ display: _t.append("inspector.new_relation")
+ };
+ var entityID = _entityIDs[0];
+ var result = [];
+ var graph = context.graph();
+ function baseDisplayValue(entity) {
+ var matched = _mainPresetIndex.match(entity, graph);
+ var presetName = matched && matched.name() || _t("inspector.relation");
+ var entityName = utilDisplayName(entity) || "";
+ return presetName + " " + entityName;
}
- }
- conflicts.conflictList = function(_) {
- if (!arguments.length)
- return _conflictList;
- _conflictList = _;
- return conflicts;
- };
- conflicts.origChanges = function(_) {
- if (!arguments.length)
- return _origChanges;
- _origChanges = _;
- return conflicts;
- };
- conflicts.shownEntityIds = function() {
- if (_conflictList && typeof _shownConflictIndex === "number") {
- return [_conflictList[_shownConflictIndex].id];
+ function baseDisplayLabel(entity) {
+ var matched = _mainPresetIndex.match(entity, graph);
+ var presetName = matched && matched.name() || _t("inspector.relation");
+ var entityName = utilDisplayName(entity) || "";
+ return (selection2) => {
+ selection2.append("b").text(presetName + " ");
+ selection2.append("span").classed("has-colour", entity.tags.colour && isColourValid(entity.tags.colour)).style("border-color", entity.tags.colour).text(entityName);
+ };
}
- return [];
- };
- return utilRebind(conflicts, dispatch10, "on");
- }
-
- // modules/ui/entity_editor.js
- var import_fast_deep_equal10 = __toESM(require_fast_deep_equal());
-
- // modules/ui/sections/entity_issues.js
- function uiSectionEntityIssues(context) {
- var preference = corePreferences("entity-issues.reference.expanded");
- var _expanded = preference === null ? true : preference === "true";
- var _entityIDs = [];
- var _issues = [];
- var _activeIssueID;
- var section = uiSection("entity-issues", context).shouldDisplay(function() {
- return _issues.length > 0;
- }).label(function() {
- return _t.html("inspector.title_count", { title: { html: _t.html("issues.list_title") }, count: _issues.length });
- }).disclosureContent(renderDisclosureContent);
- context.validator().on("validated.entity_issues", function() {
- reloadIssues();
- section.reRender();
- }).on("focusedIssue.entity_issues", function(issue) {
- makeActiveIssue(issue.id);
- });
- function reloadIssues() {
- _issues = context.validator().getSharedEntityIssues(_entityIDs, { includeDisabledRules: true });
- }
- function makeActiveIssue(issueID) {
- _activeIssueID = issueID;
- section.selection().selectAll(".issue-container").classed("active", function(d) {
- return d.id === _activeIssueID;
+ var explicitRelation = q2 && context.hasEntity(q2.toLowerCase());
+ if (explicitRelation && explicitRelation.type === "relation" && explicitRelation.id !== entityID) {
+ result.push({
+ relation: explicitRelation,
+ value: baseDisplayValue(explicitRelation) + " " + explicitRelation.id,
+ display: baseDisplayLabel(explicitRelation)
+ });
+ } else {
+ context.history().intersects(context.map().extent()).forEach(function(entity) {
+ if (entity.type !== "relation" || entity.id === entityID) return;
+ var value = baseDisplayValue(entity);
+ if (q2 && (value + " " + entity.id).toLowerCase().indexOf(q2.toLowerCase()) === -1) return;
+ result.push({
+ relation: entity,
+ value,
+ display: baseDisplayLabel(entity)
+ });
+ });
+ result.sort(function(a2, b2) {
+ return osmRelation.creationOrder(a2.relation, b2.relation);
+ });
+ var dupeGroups = Object.values(utilArrayGroupBy(result, "value")).filter(function(v2) {
+ return v2.length > 1;
+ });
+ dupeGroups.forEach(function(group) {
+ group.forEach(function(obj) {
+ obj.value += " " + obj.relation.id;
+ });
+ });
+ }
+ result.forEach(function(obj) {
+ obj.title = obj.value;
});
+ result.unshift(newRelation);
+ callback(result);
}
function renderDisclosureContent(selection2) {
- selection2.classed("grouped-items-area", true);
- _activeIssueID = _issues.length > 0 ? _issues[0].id : null;
- var containers = selection2.selectAll(".issue-container").data(_issues, function(d) {
- return d.key;
- });
- containers.exit().remove();
- var containersEnter = containers.enter().append("div").attr("class", "issue-container");
- var itemsEnter = containersEnter.append("div").attr("class", function(d) {
- return "issue severity-" + d.severity;
- }).on("mouseover.highlight", function(d3_event, d) {
- var ids = d.entityIds.filter(function(e) {
- return _entityIDs.indexOf(e) === -1;
- });
- utilHighlightEntities(ids, true, context);
- }).on("mouseout.highlight", function(d3_event, d) {
- var ids = d.entityIds.filter(function(e) {
- return _entityIDs.indexOf(e) === -1;
- });
- utilHighlightEntities(ids, false, context);
+ var memberships = getMemberships();
+ var list2 = selection2.selectAll(".member-list").data([0]);
+ list2 = list2.enter().append("ul").attr("class", "member-list").merge(list2);
+ var items = list2.selectAll("li.member-row-normal").data(memberships, function(d2) {
+ return d2.hash;
});
- var labelsEnter = itemsEnter.append("div").attr("class", "issue-label");
- var textEnter = labelsEnter.append("button").attr("class", "issue-text").on("click", function(d3_event, d) {
- makeActiveIssue(d.id);
- var extent = d.extent(context.graph());
- if (extent) {
- var setZoom = Math.max(context.map().zoom(), 19);
- context.map().unobscuredCenterZoomEase(extent.center(), setZoom);
- }
+ items.exit().each(unbind).remove();
+ var itemsEnter = items.enter().append("li").attr("class", "member-row member-row-normal form-field");
+ itemsEnter.on("mouseover", function(d3_event, d2) {
+ utilHighlightEntities([d2.relation.id], true, context);
+ }).on("mouseout", function(d3_event, d2) {
+ utilHighlightEntities([d2.relation.id], false, context);
});
- textEnter.each(function(d) {
- var iconName = "#iD-icon-" + (d.severity === "warning" ? "alert" : "error");
- select_default2(this).call(svgIcon(iconName, "issue-icon"));
+ var labelEnter = itemsEnter.append("label").attr("class", "field-label").attr("for", function(d2) {
+ return d2.domId;
});
- textEnter.append("span").attr("class", "issue-message");
- var infoButton = labelsEnter.append("button").attr("class", "issue-info-button").attr("title", _t("icons.information")).call(svgIcon("#iD-icon-inspect"));
- infoButton.on("click", function(d3_event) {
- d3_event.stopPropagation();
- d3_event.preventDefault();
- this.blur();
- var container = select_default2(this.parentNode.parentNode.parentNode);
- var info = container.selectAll(".issue-info");
- var isExpanded = info.classed("expanded");
- _expanded = !isExpanded;
- corePreferences("entity-issues.reference.expanded", _expanded);
- if (isExpanded) {
- info.transition().duration(200).style("max-height", "0px").style("opacity", "0").on("end", function() {
- info.classed("expanded", false);
- });
- } else {
- info.classed("expanded", true).transition().duration(200).style("max-height", "200px").style("opacity", "1").on("end", function() {
- info.style("max-height", null);
- });
- }
+ var labelLink = labelEnter.append("span").attr("class", "label-text").append("a").attr("href", "#").on("click", selectRelation);
+ labelLink.append("span").attr("class", "member-entity-type").text(function(d2) {
+ var matched = _mainPresetIndex.match(d2.relation, context.graph());
+ return matched && matched.name() || _t.html("inspector.relation");
});
- itemsEnter.append("ul").attr("class", "issue-fix-list");
- containersEnter.append("div").attr("class", "issue-info" + (_expanded ? " expanded" : "")).style("max-height", _expanded ? null : "0").style("opacity", _expanded ? "1" : "0").each(function(d) {
- if (typeof d.reference === "function") {
- select_default2(this).call(d.reference);
- } else {
- select_default2(this).call(_t.append("inspector.no_documentation_key"));
- }
+ labelLink.append("span").attr("class", "member-entity-name").classed("has-colour", (d2) => d2.relation.tags.colour && isColourValid(d2.relation.tags.colour)).style("border-color", (d2) => d2.relation.tags.colour).html(function(d2) {
+ const matched = _mainPresetIndex.match(d2.relation, context.graph());
+ return utilDisplayName(d2.relation, matched.suggestion);
});
- containers = containers.merge(containersEnter).classed("active", function(d) {
- return d.id === _activeIssueID;
+ labelEnter.append("button").attr("class", "members-download").attr("title", _t("icons.download")).call(svgIcon("#iD-icon-load")).on("click", downloadMembers);
+ labelEnter.append("button").attr("class", "remove member-delete").attr("title", _t("icons.remove")).call(svgIcon("#iD-operation-delete")).on("click", deleteMembership);
+ labelEnter.append("button").attr("class", "member-zoom").attr("title", _t("icons.zoom_to")).call(svgIcon("#iD-icon-framed-dot", "monochrome")).on("click", zoomToRelation);
+ items = items.merge(itemsEnter);
+ items.selectAll("button.members-download").classed("hide", (d2) => {
+ const graph = context.graph();
+ return d2.relation.members.every((m2) => graph.hasEntity(m2.id));
});
- containers.selectAll(".issue-message").html(function(d) {
- return d.message(context);
+ var wrapEnter = itemsEnter.append("div").attr("class", "form-field-input-wrap form-field-input-member");
+ wrapEnter.append("input").attr("class", "member-role").attr("id", function(d2) {
+ return d2.domId;
+ }).property("type", "text").property("value", function(d2) {
+ return typeof d2.role === "string" ? d2.role : "";
+ }).attr("title", function(d2) {
+ return Array.isArray(d2.role) ? d2.role.filter(Boolean).join("\n") : d2.role;
+ }).attr("placeholder", function(d2) {
+ return Array.isArray(d2.role) ? _t("inspector.multiple_roles") : _t("inspector.role");
+ }).classed("mixed", function(d2) {
+ return Array.isArray(d2.role);
+ }).call(utilNoAuto).on("blur", changeRole).on("change", changeRole);
+ if (taginfo) {
+ wrapEnter.each(bindTypeahead);
+ }
+ var newMembership = list2.selectAll(".member-row-new").data(_showBlank ? [0] : []);
+ newMembership.exit().remove();
+ var newMembershipEnter = newMembership.enter().append("li").attr("class", "member-row member-row-new form-field");
+ var newLabelEnter = newMembershipEnter.append("label").attr("class", "field-label");
+ newLabelEnter.append("input").attr("placeholder", _t("inspector.choose_relation")).attr("type", "text").attr("class", "member-entity-input").call(utilNoAuto);
+ newLabelEnter.append("button").attr("class", "remove member-delete").attr("title", _t("icons.remove")).call(svgIcon("#iD-operation-delete")).on("click", function() {
+ list2.selectAll(".member-row-new").remove();
});
- var fixLists = containers.selectAll(".issue-fix-list");
- var fixes = fixLists.selectAll(".issue-fix-item").data(function(d) {
- return d.fixes ? d.fixes(context) : [];
- }, function(fix) {
- return fix.id;
+ var newWrapEnter = newMembershipEnter.append("div").attr("class", "form-field-input-wrap form-field-input-member");
+ newWrapEnter.append("input").attr("class", "member-role").property("type", "text").attr("placeholder", _t("inspector.role")).call(utilNoAuto);
+ newMembership = newMembership.merge(newMembershipEnter);
+ newMembership.selectAll(".member-entity-input").on("blur", cancelEntity).call(
+ nearbyCombo.on("accept", function(d2) {
+ this.blur();
+ acceptEntity.call(this, d2);
+ }).on("cancel", cancelEntity)
+ );
+ var addRow = selection2.selectAll(".add-row").data([0]);
+ var addRowEnter = addRow.enter().append("div").attr("class", "add-row");
+ var addRelationButton = addRowEnter.append("button").attr("class", "add-relation").attr("aria-label", _t("inspector.add_to_relation"));
+ addRelationButton.call(svgIcon("#iD-icon-plus", "light"));
+ addRelationButton.call(uiTooltip().title(() => _t.append("inspector.add_to_relation")).placement(_mainLocalizer.textDirection() === "ltr" ? "right" : "left"));
+ addRowEnter.append("div").attr("class", "space-value");
+ addRowEnter.append("div").attr("class", "space-buttons");
+ addRow = addRow.merge(addRowEnter);
+ addRow.select(".add-relation").on("click", function() {
+ _showBlank = true;
+ section.reRender();
+ list2.selectAll(".member-entity-input").node().focus();
});
- fixes.exit().remove();
- var fixesEnter = fixes.enter().append("li").attr("class", "issue-fix-item");
- var buttons = fixesEnter.append("button").on("click", function(d3_event, d) {
- if (select_default2(this).attr("disabled") || !d.onClick)
- return;
- if (d.issue.dateLastRanFix && new Date() - d.issue.dateLastRanFix < 1e3)
+ function acceptEntity(d2) {
+ if (!d2) {
+ cancelEntity();
return;
- d.issue.dateLastRanFix = new Date();
- utilHighlightEntities(d.issue.entityIds.concat(d.entityIds), false, context);
- new Promise(function(resolve, reject) {
- d.onClick(context, resolve, reject);
- if (d.onClick.length <= 1) {
- resolve();
- }
- }).then(function() {
- context.validator().validate();
- });
- }).on("mouseover.highlight", function(d3_event, d) {
- utilHighlightEntities(d.entityIds, true, context);
- }).on("mouseout.highlight", function(d3_event, d) {
- utilHighlightEntities(d.entityIds, false, context);
- });
- buttons.each(function(d) {
- var iconName = d.icon || "iD-icon-wrench";
- if (iconName.startsWith("maki")) {
- iconName += "-15";
}
- select_default2(this).call(svgIcon("#" + iconName, "fix-icon"));
- });
- buttons.append("span").attr("class", "fix-message").html(function(d) {
- return d.title;
- });
- fixesEnter.merge(fixes).selectAll("button").classed("actionable", function(d) {
- return d.onClick;
- }).attr("disabled", function(d) {
- return d.onClick ? null : "true";
- }).attr("title", function(d) {
- if (d.disabledReason) {
- return d.disabledReason;
+ if (d2.relation) utilHighlightEntities([d2.relation.id], false, context);
+ var role = context.cleanRelationRole(list2.selectAll(".member-row-new .member-role").property("value"));
+ addMembership(d2, role);
+ }
+ function cancelEntity() {
+ var input = newMembership.selectAll(".member-entity-input");
+ input.property("value", "");
+ context.surface().selectAll(".highlighted").classed("highlighted", false);
+ }
+ function bindTypeahead(d2) {
+ var row = select_default2(this);
+ var role = row.selectAll("input.member-role");
+ var origValue = role.property("value");
+ function sort(value, data) {
+ var sameletter = [];
+ var other2 = [];
+ for (var i3 = 0; i3 < data.length; i3++) {
+ if (data[i3].value.substring(0, value.length) === value) {
+ sameletter.push(data[i3]);
+ } else {
+ other2.push(data[i3]);
+ }
+ }
+ return sameletter.concat(other2);
}
- return null;
- });
+ role.call(
+ uiCombobox(context, "member-role").fetcher(function(role2, callback) {
+ var rtype = d2.relation.tags.type;
+ taginfo.roles({
+ debounce: true,
+ rtype: rtype || "",
+ geometry: context.graph().geometry(_entityIDs[0]),
+ query: role2
+ }, function(err, data) {
+ if (!err) callback(sort(role2, data));
+ });
+ }).on("cancel", function() {
+ role.property("value", origValue);
+ })
+ );
+ }
+ function unbind() {
+ var row = select_default2(this);
+ row.selectAll("input.member-role").call(uiCombobox.off, context);
+ }
}
section.entityIDs = function(val) {
- if (!arguments.length)
- return _entityIDs;
- if (!_entityIDs || !val || !utilArrayIdentical(_entityIDs, val)) {
- _entityIDs = val;
- _activeIssueID = null;
- reloadIssues();
- }
+ if (!arguments.length) return _entityIDs;
+ _entityIDs = val;
+ _showBlank = false;
return section;
};
return section;
}
- // modules/ui/preset_icon.js
- function uiPresetIcon() {
- let _preset;
- let _geometry;
- function presetIcon(selection2) {
- selection2.each(render);
- }
- function getIcon(p, geom) {
- if (p.icon)
- return p.icon;
- if (geom === "line")
- return "iD-other-line";
- if (geom === "vertex")
- return p.isFallback() ? "" : "temaki-vertex";
- return "maki-marker-stroked";
- }
- function renderPointBorder(container, drawPoint) {
- let pointBorder = container.selectAll(".preset-icon-point-border").data(drawPoint ? [0] : []);
- pointBorder.exit().remove();
- let pointBorderEnter = pointBorder.enter();
- const w = 40;
- const h = 40;
- pointBorderEnter.append("svg").attr("class", "preset-icon-fill preset-icon-point-border").attr("width", w).attr("height", h).attr("viewBox", `0 0 ${w} ${h}`).append("path").attr("transform", "translate(11.5, 8)").attr("d", "M 17,8 C 17,13 11,21 8.5,23.5 C 6,21 0,13 0,8 C 0,4 4,-0.5 8.5,-0.5 C 13,-0.5 17,4 17,8 z");
- pointBorder = pointBorderEnter.merge(pointBorder);
- }
- function renderCategoryBorder(container, category) {
- let categoryBorder = container.selectAll(".preset-icon-category-border").data(category ? [0] : []);
- categoryBorder.exit().remove();
- let categoryBorderEnter = categoryBorder.enter();
- const d = 60;
- let svgEnter = categoryBorderEnter.append("svg").attr("class", "preset-icon-fill preset-icon-category-border").attr("width", d).attr("height", d).attr("viewBox", `0 0 ${d} ${d}`);
- svgEnter.append("path").attr("class", "area").attr("d", "M9.5,7.5 L25.5,7.5 L28.5,12.5 L49.5,12.5 C51.709139,12.5 53.5,14.290861 53.5,16.5 L53.5,43.5 C53.5,45.709139 51.709139,47.5 49.5,47.5 L10.5,47.5 C8.290861,47.5 6.5,45.709139 6.5,43.5 L6.5,12.5 L9.5,7.5 Z");
- categoryBorder = categoryBorderEnter.merge(categoryBorder);
- if (category) {
- categoryBorder.selectAll("path").attr("class", `area ${category.id}`);
+ // modules/ui/sections/selection_list.js
+ function uiSectionSelectionList(context) {
+ var _selectedIDs = [];
+ var section = uiSection("selected-features", context).shouldDisplay(function() {
+ return _selectedIDs.length > 1;
+ }).label(function() {
+ return _t.append("inspector.title_count", { title: _t("inspector.features"), count: _selectedIDs.length });
+ }).disclosureContent(renderDisclosureContent);
+ context.history().on("change.selectionList", function(difference2) {
+ if (difference2) {
+ section.reRender();
}
+ });
+ section.entityIDs = function(val) {
+ if (!arguments.length) return _selectedIDs;
+ _selectedIDs = val;
+ return section;
+ };
+ function selectEntity(d3_event, entity) {
+ context.enter(modeSelect(context, [entity.id]));
}
- function renderCircleFill(container, drawVertex) {
- let vertexFill = container.selectAll(".preset-icon-fill-vertex").data(drawVertex ? [0] : []);
- vertexFill.exit().remove();
- let vertexFillEnter = vertexFill.enter();
- const w = 60;
- const h = 60;
- const d = 40;
- vertexFillEnter.append("svg").attr("class", "preset-icon-fill preset-icon-fill-vertex").attr("width", w).attr("height", h).attr("viewBox", `0 0 ${w} ${h}`).append("circle").attr("cx", w / 2).attr("cy", h / 2).attr("r", d / 2);
- vertexFill = vertexFillEnter.merge(vertexFill);
+ function deselectEntity(d3_event, entity) {
+ var selectedIDs = _selectedIDs.slice();
+ var index = selectedIDs.indexOf(entity.id);
+ if (index > -1) {
+ selectedIDs.splice(index, 1);
+ context.enter(modeSelect(context, selectedIDs));
+ }
}
- function renderSquareFill(container, drawArea, tagClasses) {
- let fill = container.selectAll(".preset-icon-fill-area").data(drawArea ? [0] : []);
- fill.exit().remove();
- let fillEnter = fill.enter();
- const d = 60;
- const w = d;
- const h = d;
- const l = d * 2 / 3;
- const c1 = (w - l) / 2;
- const c2 = c1 + l;
- fillEnter = fillEnter.append("svg").attr("class", "preset-icon-fill preset-icon-fill-area").attr("width", w).attr("height", h).attr("viewBox", `0 0 ${w} ${h}`);
- ["fill", "stroke"].forEach((klass) => {
- fillEnter.append("path").attr("d", `M${c1} ${c1} L${c1} ${c2} L${c2} ${c2} L${c2} ${c1} Z`).attr("class", `area ${klass}`);
- });
- const rVertex = 2.5;
- [[c1, c1], [c1, c2], [c2, c2], [c2, c1]].forEach((point) => {
- fillEnter.append("circle").attr("class", "vertex").attr("cx", point[0]).attr("cy", point[1]).attr("r", rVertex);
+ function renderDisclosureContent(selection2) {
+ var list2 = selection2.selectAll(".feature-list").data([0]);
+ list2 = list2.enter().append("ul").attr("class", "feature-list").merge(list2);
+ var entities = _selectedIDs.map(function(id2) {
+ return context.hasEntity(id2);
+ }).filter(Boolean);
+ var items = list2.selectAll(".feature-list-item").data(entities, osmEntity.key);
+ items.exit().remove();
+ var enter = items.enter().append("li").attr("class", "feature-list-item").each(function(d2) {
+ select_default2(this).on("mouseover", function() {
+ utilHighlightEntities([d2.id], true, context);
+ }).on("mouseout", function() {
+ utilHighlightEntities([d2.id], false, context);
+ });
});
- const rMidpoint = 1.25;
- [[c1, w / 2], [c2, w / 2], [h / 2, c1], [h / 2, c2]].forEach((point) => {
- fillEnter.append("circle").attr("class", "midpoint").attr("cx", point[0]).attr("cy", point[1]).attr("r", rMidpoint);
+ var label = enter.append("button").attr("class", "label").on("click", selectEntity);
+ label.append("span").attr("class", "entity-geom-icon").call(svgIcon("", "pre-text"));
+ label.append("span").attr("class", "entity-type");
+ label.append("span").attr("class", "entity-name");
+ enter.append("button").attr("class", "close").attr("title", _t("icons.deselect")).on("click", deselectEntity).call(svgIcon("#iD-icon-close"));
+ items = items.merge(enter);
+ items.selectAll(".entity-geom-icon use").attr("href", function() {
+ var entity = this.parentNode.parentNode.__data__;
+ return "#iD-icon-" + entity.geometry(context.graph());
});
- fill = fillEnter.merge(fill);
- fill.selectAll("path.stroke").attr("class", `area stroke ${tagClasses}`);
- fill.selectAll("path.fill").attr("class", `area fill ${tagClasses}`);
- }
- function renderLine(container, drawLine, tagClasses) {
- let line = container.selectAll(".preset-icon-line").data(drawLine ? [0] : []);
- line.exit().remove();
- let lineEnter = line.enter();
- const d = 60;
- const w = d;
- const h = d;
- const y = Math.round(d * 0.72);
- const l = Math.round(d * 0.6);
- const r = 2.5;
- const x12 = (w - l) / 2;
- const x2 = x12 + l;
- lineEnter = lineEnter.append("svg").attr("class", "preset-icon-line").attr("width", w).attr("height", h).attr("viewBox", `0 0 ${w} ${h}`);
- ["casing", "stroke"].forEach((klass) => {
- lineEnter.append("path").attr("d", `M${x12} ${y} L${x2} ${y}`).attr("class", `line ${klass}`);
+ items.selectAll(".entity-type").text(function(entity) {
+ return _mainPresetIndex.match(entity, context.graph()).name();
});
- [[x12 - 1, y], [x2 + 1, y]].forEach((point) => {
- lineEnter.append("circle").attr("class", "vertex").attr("cx", point[0]).attr("cy", point[1]).attr("r", r);
+ items.selectAll(".entity-name").text(function(d2) {
+ var entity = context.entity(d2.id);
+ return utilDisplayName(entity);
});
- line = lineEnter.merge(line);
- line.selectAll("path.stroke").attr("class", `line stroke ${tagClasses}`);
- line.selectAll("path.casing").attr("class", `line casing ${tagClasses}`);
}
- function renderRoute(container, drawRoute, p) {
- let route = container.selectAll(".preset-icon-route").data(drawRoute ? [0] : []);
- route.exit().remove();
- let routeEnter = route.enter();
- const d = 60;
- const w = d;
- const h = d;
- const y12 = Math.round(d * 0.8);
- const y2 = Math.round(d * 0.68);
- const l = Math.round(d * 0.6);
- const r = 2;
- const x12 = (w - l) / 2;
- const x2 = x12 + l / 3;
- const x3 = x2 + l / 3;
- const x4 = x3 + l / 3;
- routeEnter = routeEnter.append("svg").attr("class", "preset-icon-route").attr("width", w).attr("height", h).attr("viewBox", `0 0 ${w} ${h}`);
- ["casing", "stroke"].forEach((klass) => {
- routeEnter.append("path").attr("d", `M${x12} ${y12} L${x2} ${y2}`).attr("class", `segment0 line ${klass}`);
- routeEnter.append("path").attr("d", `M${x2} ${y2} L${x3} ${y12}`).attr("class", `segment1 line ${klass}`);
- routeEnter.append("path").attr("d", `M${x3} ${y12} L${x4} ${y2}`).attr("class", `segment2 line ${klass}`);
+ return section;
+ }
+
+ // modules/ui/entity_editor.js
+ function uiEntityEditor(context) {
+ var dispatch14 = dispatch_default("choose");
+ var _state = "select";
+ var _coalesceChanges = false;
+ var _modified = false;
+ var _base;
+ var _entityIDs;
+ var _activePresets = [];
+ var _newFeature;
+ var _sections;
+ function entityEditor(selection2) {
+ var combinedTags = utilCombinedTags(_entityIDs, context.graph());
+ var header = selection2.selectAll(".header").data([0]);
+ var headerEnter = header.enter().append("div").attr("class", "header fillL");
+ var direction = _mainLocalizer.textDirection() === "rtl" ? "forward" : "backward";
+ headerEnter.append("button").attr("class", "preset-reset preset-choose").attr("title", _t("inspector.back_tooltip")).call(svgIcon("#iD-icon-".concat(direction)));
+ headerEnter.append("button").attr("class", "close").attr("title", _t("icons.close")).on("click", function() {
+ context.enter(modeBrowse(context));
+ }).call(svgIcon(_modified ? "#iD-icon-apply" : "#iD-icon-close"));
+ headerEnter.append("h2");
+ header = header.merge(headerEnter);
+ header.selectAll("h2").text("").call(_entityIDs.length === 1 ? _t.append("inspector.edit") : _t.append("inspector.edit_features"));
+ header.selectAll(".preset-reset").on("click", function() {
+ dispatch14.call("choose", this, _activePresets);
});
- [[x12, y12], [x2, y2], [x3, y12], [x4, y2]].forEach((point) => {
- routeEnter.append("circle").attr("class", "vertex").attr("cx", point[0]).attr("cy", point[1]).attr("r", r);
+ var body = selection2.selectAll(".inspector-body").data([0]);
+ var bodyEnter = body.enter().append("div").attr("class", "entity-editor inspector-body sep-top");
+ body = body.merge(bodyEnter);
+ if (!_sections) {
+ _sections = [
+ uiSectionSelectionList(context),
+ uiSectionFeatureType(context).on("choose", function(presets) {
+ dispatch14.call("choose", this, presets);
+ }),
+ uiSectionEntityIssues(context),
+ uiSectionPresetFields(context).on("change", changeTags).on("revert", revertTags),
+ uiSectionRawTagEditor("raw-tag-editor", context).on("change", changeTags),
+ uiSectionRawMemberEditor(context),
+ uiSectionRawMembershipEditor(context)
+ ];
+ }
+ _sections.forEach(function(section) {
+ if (section.entityIDs) {
+ section.entityIDs(_entityIDs);
+ }
+ if (section.presets) {
+ section.presets(_activePresets);
+ }
+ if (section.tags) {
+ section.tags(combinedTags);
+ }
+ if (section.state) {
+ section.state(_state);
+ }
+ body.call(section.render);
});
- route = routeEnter.merge(route);
- if (drawRoute) {
- let routeType = p.tags.type === "waterway" ? "waterway" : p.tags.route;
- const segmentPresetIDs = routeSegments[routeType];
- for (let i2 in segmentPresetIDs) {
- const segmentPreset = _mainPresetIndex.item(segmentPresetIDs[i2]);
- const segmentTagClasses = svgTagClasses().getClassesString(segmentPreset.tags, "");
- route.selectAll(`path.stroke.segment${i2}`).attr("class", `segment${i2} line stroke ${segmentTagClasses}`);
- route.selectAll(`path.casing.segment${i2}`).attr("class", `segment${i2} line casing ${segmentTagClasses}`);
+ context.history().on("change.entity-editor", historyChanged);
+ function historyChanged(difference2) {
+ if (selection2.selectAll(".entity-editor").empty()) return;
+ if (_state === "hide") return;
+ var significant = !difference2 || difference2.didChange.properties || difference2.didChange.addition || difference2.didChange.deletion;
+ if (!significant) return;
+ _entityIDs = _entityIDs.filter(context.hasEntity);
+ if (!_entityIDs.length) return;
+ var priorActivePreset = _activePresets.length === 1 && _activePresets[0];
+ loadActivePresets();
+ var graph = context.graph();
+ entityEditor.modified(_base !== graph);
+ entityEditor(selection2);
+ if (priorActivePreset && _activePresets.length === 1 && priorActivePreset !== _activePresets[0]) {
+ context.container().selectAll(".entity-editor button.preset-reset .label").style("background-color", "#fff").transition().duration(750).style("background-color", null);
}
}
}
- function renderSvgIcon(container, picon, geom, isFramed, category, tagClasses) {
- const isMaki = picon && /^maki-/.test(picon);
- const isTemaki = picon && /^temaki-/.test(picon);
- const isFa = picon && /^fa[srb]-/.test(picon);
- const isiDIcon = picon && !(isMaki || isTemaki || isFa);
- let icon2 = container.selectAll(".preset-icon").data(picon ? [0] : []);
- icon2.exit().remove();
- icon2 = icon2.enter().append("div").attr("class", "preset-icon").call(svgIcon("")).merge(icon2);
- icon2.attr("class", "preset-icon " + (geom ? geom + "-geom" : "")).classed("category", category).classed("framed", isFramed).classed("preset-icon-iD", isiDIcon);
- icon2.selectAll("svg").attr("class", "icon " + picon + " " + (!isiDIcon && geom !== "line" ? "" : tagClasses));
- icon2.selectAll("use").attr("href", "#" + picon);
+ function changeTags(entityIDs, changed, onInput) {
+ var actions = [];
+ for (var i3 in entityIDs) {
+ var entityID = entityIDs[i3];
+ var entity = context.entity(entityID);
+ var tags = Object.assign({}, entity.tags);
+ if (typeof changed === "function") {
+ tags = changed(tags);
+ } else {
+ for (var k2 in changed) {
+ if (!k2) continue;
+ var v2 = changed[k2];
+ if (typeof v2 === "object") {
+ tags[k2] = tags[v2.oldKey];
+ } else if (v2 !== void 0 || tags.hasOwnProperty(k2)) {
+ tags[k2] = v2;
+ }
+ }
+ }
+ if (!onInput) {
+ tags = utilCleanTags(tags);
+ }
+ if (!(0, import_fast_deep_equal9.default)(entity.tags, tags)) {
+ actions.push(actionChangeTags(entityID, tags));
+ }
+ }
+ if (actions.length) {
+ var combinedAction = function(graph) {
+ actions.forEach(function(action) {
+ graph = action(graph);
+ });
+ return graph;
+ };
+ var annotation = _t("operations.change_tags.annotation");
+ if (_coalesceChanges) {
+ context.overwrite(combinedAction, annotation);
+ } else {
+ context.perform(combinedAction, annotation);
+ _coalesceChanges = !!onInput;
+ }
+ }
+ if (!onInput) {
+ context.validator().validate();
+ }
}
- function renderImageIcon(container, imageURL) {
- let imageIcon = container.selectAll("img.image-icon").data(imageURL ? [0] : []);
- imageIcon.exit().remove();
- imageIcon = imageIcon.enter().append("img").attr("class", "image-icon").on("load", () => container.classed("showing-img", true)).on("error", () => container.classed("showing-img", false)).merge(imageIcon);
- imageIcon.attr("src", imageURL);
+ function revertTags(keys2) {
+ var actions = [];
+ for (var i3 in _entityIDs) {
+ var entityID = _entityIDs[i3];
+ var original = context.graph().base().entities[entityID];
+ var changed = {};
+ for (var j2 in keys2) {
+ var key = keys2[j2];
+ changed[key] = original ? original.tags[key] : void 0;
+ }
+ var entity = context.entity(entityID);
+ var tags = Object.assign({}, entity.tags);
+ for (var k2 in changed) {
+ if (!k2) continue;
+ var v2 = changed[k2];
+ if (v2 !== void 0 || tags.hasOwnProperty(k2)) {
+ tags[k2] = v2;
+ }
+ }
+ tags = utilCleanTags(tags);
+ if (!(0, import_fast_deep_equal9.default)(entity.tags, tags)) {
+ actions.push(actionChangeTags(entityID, tags));
+ }
+ }
+ if (actions.length) {
+ var combinedAction = function(graph) {
+ actions.forEach(function(action) {
+ graph = action(graph);
+ });
+ return graph;
+ };
+ var annotation = _t("operations.change_tags.annotation");
+ if (_coalesceChanges) {
+ context.overwrite(combinedAction, annotation);
+ } else {
+ context.perform(combinedAction, annotation);
+ _coalesceChanges = false;
+ }
+ }
+ context.validator().validate();
}
- const routeSegments = {
- bicycle: ["highway/cycleway", "highway/cycleway", "highway/cycleway"],
- bus: ["highway/unclassified", "highway/secondary", "highway/primary"],
- trolleybus: ["highway/unclassified", "highway/secondary", "highway/primary"],
- detour: ["highway/tertiary", "highway/residential", "highway/unclassified"],
- ferry: ["route/ferry", "route/ferry", "route/ferry"],
- foot: ["highway/footway", "highway/footway", "highway/footway"],
- hiking: ["highway/path", "highway/path", "highway/path"],
- horse: ["highway/bridleway", "highway/bridleway", "highway/bridleway"],
- light_rail: ["railway/light_rail", "railway/light_rail", "railway/light_rail"],
- monorail: ["railway/monorail", "railway/monorail", "railway/monorail"],
- mtb: ["highway/path", "highway/track", "highway/bridleway"],
- pipeline: ["man_made/pipeline", "man_made/pipeline", "man_made/pipeline"],
- piste: ["piste/downhill", "piste/hike", "piste/nordic"],
- power: ["power/line", "power/line", "power/line"],
- road: ["highway/secondary", "highway/primary", "highway/trunk"],
- subway: ["railway/subway", "railway/subway", "railway/subway"],
- train: ["railway/rail", "railway/rail", "railway/rail"],
- tram: ["railway/tram", "railway/tram", "railway/tram"],
- waterway: ["waterway/stream", "waterway/stream", "waterway/stream"]
+ entityEditor.modified = function(val) {
+ if (!arguments.length) return _modified;
+ _modified = val;
+ return entityEditor;
};
- function render() {
- let p = _preset.apply(this, arguments);
- let geom = _geometry ? _geometry.apply(this, arguments) : null;
- if (geom === "relation" && p.tags && (p.tags.type === "route" && p.tags.route && routeSegments[p.tags.route] || p.tags.type === "waterway")) {
- geom = "route";
+ entityEditor.state = function(val) {
+ if (!arguments.length) return _state;
+ _state = val;
+ return entityEditor;
+ };
+ entityEditor.entityIDs = function(val) {
+ if (!arguments.length) return _entityIDs;
+ _base = context.graph();
+ _coalesceChanges = false;
+ if (val && _entityIDs && utilArrayIdentical(_entityIDs, val)) return entityEditor;
+ _entityIDs = val;
+ loadActivePresets(true);
+ return entityEditor.modified(false);
+ };
+ entityEditor.newFeature = function(val) {
+ if (!arguments.length) return _newFeature;
+ _newFeature = val;
+ return entityEditor;
+ };
+ function loadActivePresets(isForNewSelection) {
+ var graph = context.graph();
+ var counts = {};
+ for (var i3 in _entityIDs) {
+ var entity = graph.hasEntity(_entityIDs[i3]);
+ if (!entity) return;
+ var match = _mainPresetIndex.match(entity, graph);
+ if (!counts[match.id]) counts[match.id] = 0;
+ counts[match.id] += 1;
}
- const showThirdPartyIcons = corePreferences("preferences.privacy.thirdpartyicons") || "true";
- const isFallback = p.isFallback && p.isFallback();
- const imageURL = showThirdPartyIcons === "true" && p.imageURL;
- const picon = getIcon(p, geom);
- const isCategory = !p.setTags;
- const drawPoint = false;
- const drawVertex = picon !== null && geom === "vertex" && !isFallback;
- const drawLine = picon && geom === "line" && !isFallback && !isCategory;
- const drawArea = picon && geom === "area" && !isFallback && !isCategory;
- const drawRoute = picon && geom === "route";
- const isFramed = drawVertex || drawArea || drawLine || drawRoute || isCategory;
- let tags = !isCategory ? p.setTags({}, geom) : {};
- for (let k in tags) {
- if (tags[k] === "*") {
- tags[k] = "yes";
+ var matches = Object.keys(counts).sort(function(p1, p2) {
+ return counts[p2] - counts[p1];
+ }).map(function(pID) {
+ return _mainPresetIndex.item(pID);
+ });
+ if (!isForNewSelection) {
+ var weakPreset = _activePresets.length === 1 && !_activePresets[0].isFallback() && Object.keys(_activePresets[0].addTags || {}).length === 0;
+ if (weakPreset && matches.length === 1 && matches[0].isFallback()) return;
+ }
+ entityEditor.presets(matches);
+ }
+ entityEditor.presets = function(val) {
+ if (!arguments.length) return _activePresets;
+ if (!utilArrayIdentical(val, _activePresets)) {
+ _activePresets = val;
+ }
+ return entityEditor;
+ };
+ return utilRebind(entityEditor, dispatch14, "on");
+ }
+
+ // modules/ui/preset_list.js
+ function uiPresetList(context) {
+ var dispatch14 = dispatch_default("cancel", "choose");
+ var _entityIDs;
+ var _currLoc;
+ var _currentPresets;
+ var _autofocus = false;
+ function presetList(selection2) {
+ if (!_entityIDs) return;
+ var presets = _mainPresetIndex.matchAllGeometry(entityGeometries());
+ selection2.html("");
+ var messagewrap = selection2.append("div").attr("class", "header fillL");
+ var message = messagewrap.append("h2").call(_t.append("inspector.choose"));
+ var direction = _mainLocalizer.textDirection() === "rtl" ? "backward" : "forward";
+ messagewrap.append("button").attr("class", "preset-choose").attr("title", _entityIDs.length === 1 ? _t("inspector.edit") : _t("inspector.edit_features")).on("click", function() {
+ dispatch14.call("cancel", this);
+ }).call(svgIcon("#iD-icon-".concat(direction)));
+ function initialKeydown(d3_event) {
+ if (search.property("value").length === 0 && (d3_event.keyCode === utilKeybinding.keyCodes["\u232B"] || d3_event.keyCode === utilKeybinding.keyCodes["\u2326"])) {
+ d3_event.preventDefault();
+ d3_event.stopPropagation();
+ operationDelete(context, _entityIDs)();
+ } else if (search.property("value").length === 0 && (d3_event.ctrlKey || d3_event.metaKey) && d3_event.keyCode === utilKeybinding.keyCodes.z) {
+ d3_event.preventDefault();
+ d3_event.stopPropagation();
+ context.undo();
+ } else if (!d3_event.ctrlKey && !d3_event.metaKey) {
+ select_default2(this).on("keydown", keydown);
+ keydown.call(this, d3_event);
+ }
+ }
+ function keydown(d3_event) {
+ if (d3_event.keyCode === utilKeybinding.keyCodes["\u2193"] && // if insertion point is at the end of the string
+ search.node().selectionStart === search.property("value").length) {
+ d3_event.preventDefault();
+ d3_event.stopPropagation();
+ var buttons = list2.selectAll(".preset-list-button");
+ if (!buttons.empty()) buttons.nodes()[0].focus();
+ }
+ }
+ function keypress(d3_event) {
+ var value = search.property("value");
+ if (d3_event.keyCode === 13 && // â© Return
+ value.length) {
+ list2.selectAll(".preset-list-item:first-child").each(function(d2) {
+ d2.choose.call(this);
+ });
+ }
+ }
+ function inputevent() {
+ var value = search.property("value");
+ list2.classed("filtered", value.length);
+ var results, messageText;
+ if (value.length) {
+ results = presets.search(value, entityGeometries()[0], _currLoc);
+ messageText = _t.html("inspector.results", {
+ n: results.collection.length,
+ search: value
+ });
+ } else {
+ var entityPresets2 = _entityIDs.map((entityID) => _mainPresetIndex.match(context.graph().entity(entityID), context.graph()));
+ results = _mainPresetIndex.defaults(entityGeometries()[0], 36, !context.inIntro(), _currLoc, entityPresets2);
+ messageText = _t.html("inspector.choose");
+ }
+ list2.call(drawList, results);
+ message.html(messageText);
+ }
+ var searchWrap = selection2.append("div").attr("class", "search-header");
+ searchWrap.call(svgIcon("#iD-icon-search", "pre-text"));
+ var search = searchWrap.append("input").attr("class", "preset-search-input").attr("placeholder", _t("inspector.search")).attr("type", "search").call(utilNoAuto).on("keydown", initialKeydown).on("keypress", keypress).on("input", debounce_default(inputevent));
+ if (_autofocus) {
+ search.node().focus();
+ setTimeout(function() {
+ search.node().focus();
+ }, 0);
+ }
+ var listWrap = selection2.append("div").attr("class", "inspector-body");
+ var entityPresets = _entityIDs.map((entityID) => _mainPresetIndex.match(context.graph().entity(entityID), context.graph()));
+ var list2 = listWrap.append("div").attr("class", "preset-list").call(drawList, _mainPresetIndex.defaults(entityGeometries()[0], 36, !context.inIntro(), _currLoc, entityPresets));
+ context.features().on("change.preset-list", updateForFeatureHiddenState);
+ }
+ function drawList(list2, presets) {
+ presets = presets.matchAllGeometry(entityGeometries());
+ var collection = presets.collection.reduce(function(collection2, preset) {
+ if (!preset) return collection2;
+ if (preset.members) {
+ if (preset.members.collection.filter(function(preset2) {
+ return preset2.addable();
+ }).length > 1) {
+ collection2.push(CategoryItem(preset));
+ }
+ } else if (preset.addable()) {
+ collection2.push(PresetItem(preset));
+ }
+ return collection2;
+ }, []);
+ var items = list2.selectAll(".preset-list-item").data(collection, function(d2) {
+ return d2.preset.id;
+ });
+ items.order();
+ items.exit().remove();
+ items.enter().append("div").attr("class", function(item) {
+ return "preset-list-item preset-" + item.preset.id.replace("/", "-");
+ }).classed("current", function(item) {
+ return _currentPresets.indexOf(item.preset) !== -1;
+ }).each(function(item) {
+ select_default2(this).call(item);
+ }).style("opacity", 0).transition().style("opacity", 1);
+ updateForFeatureHiddenState();
+ }
+ function itemKeydown(d3_event) {
+ var item = select_default2(this.closest(".preset-list-item"));
+ var parentItem = select_default2(item.node().parentNode.closest(".preset-list-item"));
+ if (d3_event.keyCode === utilKeybinding.keyCodes["\u2193"]) {
+ d3_event.preventDefault();
+ d3_event.stopPropagation();
+ var nextItem = select_default2(item.node().nextElementSibling);
+ if (nextItem.empty()) {
+ if (!parentItem.empty()) {
+ nextItem = select_default2(parentItem.node().nextElementSibling);
+ }
+ } else if (select_default2(this).classed("expanded")) {
+ nextItem = item.select(".subgrid .preset-list-item:first-child");
+ }
+ if (!nextItem.empty()) {
+ nextItem.select(".preset-list-button").node().focus();
+ }
+ } else if (d3_event.keyCode === utilKeybinding.keyCodes["\u2191"]) {
+ d3_event.preventDefault();
+ d3_event.stopPropagation();
+ var previousItem = select_default2(item.node().previousElementSibling);
+ if (previousItem.empty()) {
+ if (!parentItem.empty()) {
+ previousItem = parentItem;
+ }
+ } else if (previousItem.select(".preset-list-button").classed("expanded")) {
+ previousItem = previousItem.select(".subgrid .preset-list-item:last-child");
+ }
+ if (!previousItem.empty()) {
+ previousItem.select(".preset-list-button").node().focus();
+ } else {
+ var search = select_default2(this.closest(".preset-list-pane")).select(".preset-search-input");
+ search.node().focus();
+ }
+ } else if (d3_event.keyCode === utilKeybinding.keyCodes[_mainLocalizer.textDirection() === "rtl" ? "\u2192" : "\u2190"]) {
+ d3_event.preventDefault();
+ d3_event.stopPropagation();
+ if (!parentItem.empty()) {
+ parentItem.select(".preset-list-button").node().focus();
+ }
+ } else if (d3_event.keyCode === utilKeybinding.keyCodes[_mainLocalizer.textDirection() === "rtl" ? "\u2190" : "\u2192"]) {
+ d3_event.preventDefault();
+ d3_event.stopPropagation();
+ item.datum().choose.call(select_default2(this).node());
+ }
+ }
+ function CategoryItem(preset) {
+ var box, sublist, shown = false;
+ function item(selection2) {
+ var wrap2 = selection2.append("div").attr("class", "preset-list-button-wrap category");
+ function click() {
+ var isExpanded = select_default2(this).classed("expanded");
+ var iconName = isExpanded ? _mainLocalizer.textDirection() === "rtl" ? "#iD-icon-backward" : "#iD-icon-forward" : "#iD-icon-down";
+ select_default2(this).classed("expanded", !isExpanded).attr("title", !isExpanded ? _t("icons.collapse") : _t("icons.expand"));
+ select_default2(this).selectAll("div.label-inner svg.icon use").attr("href", iconName);
+ item.choose();
}
+ var geometries = entityGeometries();
+ var button = wrap2.append("button").attr("class", "preset-list-button").attr("title", _t("icons.expand")).classed("expanded", false).call(uiPresetIcon().geometry(geometries.length === 1 && geometries[0]).preset(preset)).on("click", click).on("keydown", function(d3_event) {
+ if (d3_event.keyCode === utilKeybinding.keyCodes[_mainLocalizer.textDirection() === "rtl" ? "\u2190" : "\u2192"]) {
+ d3_event.preventDefault();
+ d3_event.stopPropagation();
+ if (!select_default2(this).classed("expanded")) {
+ click.call(this, d3_event);
+ }
+ } else if (d3_event.keyCode === utilKeybinding.keyCodes[_mainLocalizer.textDirection() === "rtl" ? "\u2192" : "\u2190"]) {
+ d3_event.preventDefault();
+ d3_event.stopPropagation();
+ if (select_default2(this).classed("expanded")) {
+ click.call(this, d3_event);
+ }
+ } else {
+ itemKeydown.call(this, d3_event);
+ }
+ });
+ var label = button.append("div").attr("class", "label").append("div").attr("class", "label-inner");
+ label.append("div").attr("class", "namepart").call(svgIcon(_mainLocalizer.textDirection() === "rtl" ? "#iD-icon-backward" : "#iD-icon-forward", "inline")).append("span").call(preset.nameLabel()).append("span").text("\u2026");
+ box = selection2.append("div").attr("class", "subgrid").style("max-height", "0px").style("opacity", 0);
+ box.append("div").attr("class", "arrow");
+ sublist = box.append("div").attr("class", "preset-list fillL3");
}
- let tagClasses = svgTagClasses().getClassesString(tags, "");
- let selection2 = select_default2(this);
- let container = selection2.selectAll(".preset-icon-container").data([0]);
- container = container.enter().append("div").attr("class", "preset-icon-container").merge(container);
- container.classed("showing-img", !!imageURL).classed("fallback", isFallback);
- renderCategoryBorder(container, isCategory && p);
- renderPointBorder(container, drawPoint);
- renderCircleFill(container, drawVertex);
- renderSquareFill(container, drawArea, tagClasses);
- renderLine(container, drawLine, tagClasses);
- renderRoute(container, drawRoute, p);
- renderSvgIcon(container, picon, geom, isFramed, isCategory, tagClasses);
- renderImageIcon(container, imageURL);
+ item.choose = function() {
+ if (!box || !sublist) return;
+ if (shown) {
+ shown = false;
+ box.transition().duration(200).style("opacity", "0").style("max-height", "0px").style("padding-bottom", "0px");
+ } else {
+ shown = true;
+ var members = preset.members.matchAllGeometry(entityGeometries());
+ sublist.call(drawList, members);
+ box.transition().duration(200).style("opacity", "1").style("max-height", 200 + members.collection.length * 190 + "px").style("padding-bottom", "10px");
+ }
+ };
+ item.preset = preset;
+ return item;
}
- presetIcon.preset = function(val) {
- if (!arguments.length)
- return _preset;
- _preset = utilFunctor(val);
- return presetIcon;
- };
- presetIcon.geometry = function(val) {
- if (!arguments.length)
- return _geometry;
- _geometry = utilFunctor(val);
- return presetIcon;
- };
- return presetIcon;
- }
-
- // modules/ui/sections/feature_type.js
- function uiSectionFeatureType(context) {
- var dispatch10 = dispatch_default("choose");
- var _entityIDs = [];
- var _presets = [];
- var _tagReference;
- var section = uiSection("feature-type", context).label(_t.html("inspector.feature_type")).disclosureContent(renderDisclosureContent);
- function renderDisclosureContent(selection2) {
- selection2.classed("preset-list-item", true);
- selection2.classed("mixed-types", _presets.length > 1);
- var presetButtonWrap = selection2.selectAll(".preset-list-button-wrap").data([0]).enter().append("div").attr("class", "preset-list-button-wrap");
- var presetButton = presetButtonWrap.append("button").attr("class", "preset-list-button preset-reset").call(uiTooltip().title(_t.html("inspector.back_tooltip")).placement("bottom"));
- presetButton.append("div").attr("class", "preset-icon-container");
- presetButton.append("div").attr("class", "label").append("div").attr("class", "label-inner");
- presetButtonWrap.append("div").attr("class", "accessory-buttons");
- var tagReferenceBodyWrap = selection2.selectAll(".tag-reference-body-wrap").data([0]);
- tagReferenceBodyWrap = tagReferenceBodyWrap.enter().append("div").attr("class", "tag-reference-body-wrap").merge(tagReferenceBodyWrap);
- if (_tagReference) {
- selection2.selectAll(".preset-list-button-wrap .accessory-buttons").style("display", _presets.length === 1 ? null : "none").call(_tagReference.button);
- tagReferenceBodyWrap.style("display", _presets.length === 1 ? null : "none").call(_tagReference.body);
+ function PresetItem(preset) {
+ function item(selection2) {
+ var wrap2 = selection2.append("div").attr("class", "preset-list-button-wrap");
+ var geometries = entityGeometries();
+ var button = wrap2.append("button").attr("class", "preset-list-button").call(uiPresetIcon().geometry(geometries.length === 1 && geometries[0]).preset(preset)).on("click", item.choose).on("keydown", itemKeydown);
+ var label = button.append("div").attr("class", "label").append("div").attr("class", "label-inner");
+ var nameparts = [
+ preset.nameLabel(),
+ preset.subtitleLabel()
+ ].filter(Boolean);
+ label.selectAll(".namepart").data(nameparts, (d2) => d2.stringId).enter().append("div").attr("class", "namepart").text("").each(function(d2) {
+ d2(select_default2(this));
+ });
+ wrap2.call(item.reference.button);
+ selection2.call(item.reference.body);
}
- selection2.selectAll(".preset-reset").on("click", function() {
- dispatch10.call("choose", this, _presets);
- }).on("pointerdown pointerup mousedown mouseup", function(d3_event) {
- d3_event.preventDefault();
+ item.choose = function() {
+ if (select_default2(this).classed("disabled")) return;
+ if (!context.inIntro()) {
+ _mainPresetIndex.setMostRecent(preset, entityGeometries()[0]);
+ }
+ context.perform(
+ function(graph) {
+ for (var i3 in _entityIDs) {
+ var entityID = _entityIDs[i3];
+ var oldPreset = _mainPresetIndex.match(graph.entity(entityID), graph);
+ graph = actionChangePreset(entityID, oldPreset, preset)(graph);
+ }
+ return graph;
+ },
+ _t("operations.change_tags.annotation")
+ );
+ context.validator().validate();
+ dispatch14.call("choose", this, preset);
+ };
+ item.help = function(d3_event) {
d3_event.stopPropagation();
- });
+ item.reference.toggle();
+ };
+ item.preset = preset;
+ item.reference = uiTagReference(preset.reference(), context);
+ return item;
+ }
+ function updateForFeatureHiddenState() {
+ if (!_entityIDs.every(context.hasEntity)) return;
var geometries = entityGeometries();
- selection2.select(".preset-list-item button").call(uiPresetIcon().geometry(_presets.length === 1 ? geometries.length === 1 && geometries[0] : null).preset(_presets.length === 1 ? _presets[0] : _mainPresetIndex.item("point")));
- var names = _presets.length === 1 ? [
- _presets[0].nameLabel(),
- _presets[0].subtitleLabel()
- ].filter(Boolean) : [_t("inspector.multiple_types")];
- var label = selection2.select(".label-inner");
- var nameparts = label.selectAll(".namepart").data(names, function(d) {
- return d;
- });
- nameparts.exit().remove();
- nameparts.enter().append("div").attr("class", "namepart").html(function(d) {
- return d;
+ var button = context.container().selectAll(".preset-list .preset-list-button");
+ button.call(uiTooltip().destroyAny);
+ button.each(function(item, index) {
+ var hiddenPresetFeaturesId;
+ for (var i3 in geometries) {
+ hiddenPresetFeaturesId = context.features().isHiddenPreset(item.preset, geometries[i3]);
+ if (hiddenPresetFeaturesId) break;
+ }
+ var isHiddenPreset = !context.inIntro() && !!hiddenPresetFeaturesId && (_currentPresets.length !== 1 || item.preset !== _currentPresets[0]);
+ select_default2(this).classed("disabled", isHiddenPreset);
+ if (isHiddenPreset) {
+ var isAutoHidden = context.features().autoHidden(hiddenPresetFeaturesId);
+ select_default2(this).call(
+ uiTooltip().title(() => _t.append("inspector.hidden_preset." + (isAutoHidden ? "zoom" : "manual"), {
+ features: _t("feature." + hiddenPresetFeaturesId + ".description")
+ })).placement(index < 2 ? "bottom" : "top")
+ );
+ }
});
}
- section.entityIDs = function(val) {
- if (!arguments.length)
- return _entityIDs;
- _entityIDs = val;
- return section;
+ presetList.autofocus = function(val) {
+ if (!arguments.length) return _autofocus;
+ _autofocus = val;
+ return presetList;
};
- section.presets = function(val) {
- if (!arguments.length)
- return _presets;
- if (!utilArrayIdentical(val, _presets)) {
- _presets = val;
- if (_presets.length === 1) {
- _tagReference = uiTagReference(_presets[0].reference(), context).showing(false);
- }
+ presetList.entityIDs = function(val) {
+ if (!arguments.length) return _entityIDs;
+ _entityIDs = val;
+ _currLoc = null;
+ if (_entityIDs && _entityIDs.length) {
+ const extent = _entityIDs.reduce(function(extent2, entityID) {
+ var entity = context.graph().entity(entityID);
+ return extent2.extend(entity.extent(context.graph()));
+ }, geoExtent());
+ _currLoc = extent.center();
+ var presets = _entityIDs.map(function(entityID) {
+ return _mainPresetIndex.match(context.entity(entityID), context.graph());
+ });
+ presetList.presets(presets);
}
- return section;
+ return presetList;
+ };
+ presetList.presets = function(val) {
+ if (!arguments.length) return _currentPresets;
+ _currentPresets = val;
+ return presetList;
};
function entityGeometries() {
var counts = {};
- for (var i2 in _entityIDs) {
- var geometry = context.graph().geometry(_entityIDs[i2]);
- if (!counts[geometry])
- counts[geometry] = 0;
+ for (var i3 in _entityIDs) {
+ var entityID = _entityIDs[i3];
+ var entity = context.entity(entityID);
+ var geometry = entity.geometry(context.graph());
+ if (geometry === "vertex" && entity.isOnAddressLine(context.graph())) {
+ geometry = "point";
+ }
+ if (!counts[geometry]) counts[geometry] = 0;
counts[geometry] += 1;
}
return Object.keys(counts).sort(function(geom1, geom2) {
return counts[geom2] - counts[geom1];
});
}
- return utilRebind(section, dispatch10, "on");
- }
-
- // modules/ui/sections/preset_fields.js
- function uiSectionPresetFields(context) {
- var section = uiSection("preset-fields", context).label(_t.html("inspector.fields")).disclosureContent(renderDisclosureContent);
- var dispatch10 = dispatch_default("change", "revert");
- var formFields = uiFormFields(context);
- var _state;
- var _fieldsArr;
- var _presets = [];
- var _tags;
- var _entityIDs;
- function renderDisclosureContent(selection2) {
- if (!_fieldsArr) {
- var graph = context.graph();
- var geometries = Object.keys(_entityIDs.reduce(function(geoms, entityID) {
- geoms[graph.entity(entityID).geometry(graph)] = true;
- return geoms;
- }, {}));
- var presetsManager = _mainPresetIndex;
- var allFields = [];
- var allMoreFields = [];
- var sharedTotalFields;
- _presets.forEach(function(preset) {
- var fields = preset.fields();
- var moreFields = preset.moreFields();
- allFields = utilArrayUnion(allFields, fields);
- allMoreFields = utilArrayUnion(allMoreFields, moreFields);
- if (!sharedTotalFields) {
- sharedTotalFields = utilArrayUnion(fields, moreFields);
- } else {
- sharedTotalFields = sharedTotalFields.filter(function(field) {
- return fields.indexOf(field) !== -1 || moreFields.indexOf(field) !== -1;
- });
- }
- });
- var sharedFields = allFields.filter(function(field) {
- return sharedTotalFields.indexOf(field) !== -1;
- });
- var sharedMoreFields = allMoreFields.filter(function(field) {
- return sharedTotalFields.indexOf(field) !== -1;
- });
- _fieldsArr = [];
- sharedFields.forEach(function(field) {
- if (field.matchAllGeometry(geometries)) {
- _fieldsArr.push(uiField(context, field, _entityIDs));
- }
- });
- var singularEntity = _entityIDs.length === 1 && graph.hasEntity(_entityIDs[0]);
- if (singularEntity && singularEntity.isHighwayIntersection(graph) && presetsManager.field("restrictions")) {
- _fieldsArr.push(uiField(context, presetsManager.field("restrictions"), _entityIDs));
- }
- var additionalFields = utilArrayUnion(sharedMoreFields, presetsManager.universal());
- additionalFields.sort(function(field1, field2) {
- return field1.label().localeCompare(field2.label(), _mainLocalizer.localeCode());
- });
- additionalFields.forEach(function(field) {
- if (sharedFields.indexOf(field) === -1 && field.matchAllGeometry(geometries)) {
- _fieldsArr.push(uiField(context, field, _entityIDs, { show: false }));
- }
- });
- _fieldsArr.forEach(function(field) {
- field.on("change", function(t, onInput) {
- dispatch10.call("change", field, _entityIDs, t, onInput);
- }).on("revert", function(keys) {
- dispatch10.call("revert", field, keys);
- });
- });
- }
- _fieldsArr.forEach(function(field) {
- field.state(_state).tags(_tags);
- });
- selection2.call(formFields.fieldsArr(_fieldsArr).state(_state).klass("grouped-items-area"));
- selection2.selectAll(".wrap-form-field input").on("keydown", function(d3_event) {
- if (d3_event.keyCode === 13 && context.container().select(".combobox").empty()) {
- context.enter(modeBrowse(context));
- }
- });
- }
- section.presets = function(val) {
- if (!arguments.length)
- return _presets;
- if (!_presets || !val || !utilArrayIdentical(_presets, val)) {
- _presets = val;
- _fieldsArr = null;
- }
- return section;
- };
- section.state = function(val) {
- if (!arguments.length)
- return _state;
- _state = val;
- return section;
- };
- section.tags = function(val) {
- if (!arguments.length)
- return _tags;
- _tags = val;
- return section;
- };
- section.entityIDs = function(val) {
- if (!arguments.length)
- return _entityIDs;
- if (!val || !_entityIDs || !utilArrayIdentical(_entityIDs, val)) {
- _entityIDs = val;
- _fieldsArr = null;
- }
- return section;
- };
- return utilRebind(section, dispatch10, "on");
+ return utilRebind(presetList, dispatch14, "on");
}
- // modules/ui/sections/raw_member_editor.js
- function uiSectionRawMemberEditor(context) {
- var section = uiSection("raw-member-editor", context).shouldDisplay(function() {
- if (!_entityIDs || _entityIDs.length !== 1)
- return false;
- var entity = context.hasEntity(_entityIDs[0]);
- return entity && entity.type === "relation";
- }).label(function() {
- var entity = context.hasEntity(_entityIDs[0]);
- if (!entity)
- return "";
- var gt = entity.members.length > _maxMembers ? ">" : "";
- var count = gt + entity.members.slice(0, _maxMembers).length;
- return _t.html("inspector.title_count", { title: { html: _t.html("inspector.members") }, count });
- }).disclosureContent(renderDisclosureContent);
- var taginfo = services.taginfo;
+ // modules/ui/inspector.js
+ function uiInspector(context) {
+ var presetList = uiPresetList(context);
+ var entityEditor = uiEntityEditor(context);
+ var wrap2 = select_default2(null), presetPane = select_default2(null), editorPane = select_default2(null);
+ var _state = "select";
var _entityIDs;
- var _maxMembers = 1e3;
- function downloadMember(d3_event, d) {
- d3_event.preventDefault();
- select_default2(this.parentNode).classed("tag-reference-loading", true);
- context.loadEntity(d.id, function() {
- section.reRender();
+ var _newFeature = false;
+ function inspector(selection2) {
+ presetList.entityIDs(_entityIDs).autofocus(_newFeature).on("choose", inspector.setPreset).on("cancel", function() {
+ inspector.setPreset();
});
- }
- function zoomToMember(d3_event, d) {
- d3_event.preventDefault();
- var entity = context.entity(d.id);
- context.map().zoomToEase(entity);
- utilHighlightEntities([d.id], true, context);
- }
- function selectMember(d3_event, d) {
- d3_event.preventDefault();
- utilHighlightEntities([d.id], false, context);
- var entity = context.entity(d.id);
- var mapExtent = context.map().extent();
- if (!entity.intersects(mapExtent, context.graph())) {
- context.map().zoomToEase(entity);
- }
- context.enter(modeSelect(context, [d.id]));
- }
- function changeRole(d3_event, d) {
- var oldRole = d.role;
- var newRole = context.cleanRelationRole(select_default2(this).property("value"));
- if (oldRole !== newRole) {
- var member = { id: d.id, type: d.type, role: newRole };
- context.perform(actionChangeMember(d.relation.id, member, d.index), _t("operations.change_role.annotation", {
- n: 1
- }));
- context.validator().validate();
+ entityEditor.state(_state).entityIDs(_entityIDs).on("choose", inspector.showList);
+ wrap2 = selection2.selectAll(".panewrap").data([0]);
+ var enter = wrap2.enter().append("div").attr("class", "panewrap");
+ enter.append("div").attr("class", "preset-list-pane pane");
+ enter.append("div").attr("class", "entity-editor-pane pane");
+ wrap2 = wrap2.merge(enter);
+ presetPane = wrap2.selectAll(".preset-list-pane");
+ editorPane = wrap2.selectAll(".entity-editor-pane");
+ function shouldDefaultToPresetList() {
+ if (_state !== "select") return false;
+ if (_entityIDs.length !== 1) return false;
+ var entityID = _entityIDs[0];
+ var entity = context.hasEntity(entityID);
+ if (!entity) return false;
+ if (entity.hasNonGeometryTags()) return false;
+ if (_newFeature) return true;
+ if (entity.geometry(context.graph()) !== "vertex") return false;
+ if (context.graph().parentRelations(entity).length) return false;
+ if (context.validator().getEntityIssues(entityID).length) return false;
+ if (entity.isHighwayIntersection(context.graph())) return false;
+ return true;
}
- }
- function deleteMember(d3_event, d) {
- utilHighlightEntities([d.id], false, context);
- context.perform(actionDeleteMember(d.relation.id, d.index), _t("operations.delete_member.annotation", {
- n: 1
- }));
- if (!context.hasEntity(d.relation.id)) {
- context.enter(modeBrowse(context));
+ if (shouldDefaultToPresetList()) {
+ wrap2.style("right", "-100%");
+ editorPane.classed("hide", true);
+ presetPane.classed("hide", false).call(presetList);
} else {
- context.validator().validate();
+ wrap2.style("right", "0%");
+ presetPane.classed("hide", true);
+ editorPane.classed("hide", false).call(entityEditor);
}
+ var footer = selection2.selectAll(".footer").data([0]);
+ footer = footer.enter().append("div").attr("class", "footer").merge(footer);
+ footer.call(
+ uiViewOnOSM(context).what(context.hasEntity(_entityIDs.length === 1 && _entityIDs[0]))
+ );
}
- function renderDisclosureContent(selection2) {
- var entityID = _entityIDs[0];
- var memberships = [];
- var entity = context.entity(entityID);
- entity.members.slice(0, _maxMembers).forEach(function(member, index) {
- memberships.push({
- index,
- id: member.id,
- type: member.type,
- role: member.role,
- relation: entity,
- member: context.hasEntity(member.id),
- domId: utilUniqueDomId(entityID + "-member-" + index)
- });
- });
- var list = selection2.selectAll(".member-list").data([0]);
- list = list.enter().append("ul").attr("class", "member-list").merge(list);
- var items = list.selectAll("li").data(memberships, function(d) {
- return osmEntity.key(d.relation) + "," + d.index + "," + (d.member ? osmEntity.key(d.member) : "incomplete");
- });
- items.exit().each(unbind).remove();
- var itemsEnter = items.enter().append("li").attr("class", "member-row form-field").classed("member-incomplete", function(d) {
- return !d.member;
- });
- itemsEnter.each(function(d) {
- var item = select_default2(this);
- var label = item.append("label").attr("class", "field-label").attr("for", d.domId);
- if (d.member) {
- item.on("mouseover", function() {
- utilHighlightEntities([d.id], true, context);
- }).on("mouseout", function() {
- utilHighlightEntities([d.id], false, context);
- });
- var labelLink = label.append("span").attr("class", "label-text").append("a").attr("href", "#").on("click", selectMember);
- labelLink.append("span").attr("class", "member-entity-type").text(function(d2) {
- var matched = _mainPresetIndex.match(d2.member, context.graph());
- return matched && matched.name() || utilDisplayType(d2.member.id);
- });
- labelLink.append("span").attr("class", "member-entity-name").text(function(d2) {
- return utilDisplayName(d2.member);
- });
- label.append("button").attr("title", _t("icons.remove")).attr("class", "remove member-delete").call(svgIcon("#iD-operation-delete"));
- label.append("button").attr("class", "member-zoom").attr("title", _t("icons.zoom_to")).call(svgIcon("#iD-icon-framed-dot", "monochrome")).on("click", zoomToMember);
- } else {
- var labelText = label.append("span").attr("class", "label-text");
- labelText.append("span").attr("class", "member-entity-type").call(_t.append("inspector." + d.type, { id: d.id }));
- labelText.append("span").attr("class", "member-entity-name").call(_t.append("inspector.incomplete", { id: d.id }));
- label.append("button").attr("class", "member-download").attr("title", _t("icons.download")).call(svgIcon("#iD-icon-load")).on("click", downloadMember);
- }
+ inspector.showList = function(presets) {
+ presetPane.classed("hide", false);
+ wrap2.transition().styleTween("right", function() {
+ return value_default("0%", "-100%");
+ }).on("end", function() {
+ editorPane.classed("hide", true);
});
- var wrapEnter = itemsEnter.append("div").attr("class", "form-field-input-wrap form-field-input-member");
- wrapEnter.append("input").attr("class", "member-role").attr("id", function(d) {
- return d.domId;
- }).property("type", "text").attr("placeholder", _t("inspector.role")).call(utilNoAuto);
- if (taginfo) {
- wrapEnter.each(bindTypeahead);
+ if (presets) {
+ presetList.presets(presets);
}
- items = items.merge(itemsEnter).order();
- items.select("input.member-role").property("value", function(d) {
- return d.role;
- }).on("blur", changeRole).on("change", changeRole);
- items.select("button.member-delete").on("click", deleteMember);
- var dragOrigin, targetIndex;
- items.call(drag_default().on("start", function(d3_event) {
- dragOrigin = {
- x: d3_event.x,
- y: d3_event.y
- };
- targetIndex = null;
- }).on("drag", function(d3_event) {
- var x = d3_event.x - dragOrigin.x, y = d3_event.y - dragOrigin.y;
- if (!select_default2(this).classed("dragging") && Math.sqrt(Math.pow(x, 2) + Math.pow(y, 2)) <= 5)
- return;
- var index = items.nodes().indexOf(this);
- select_default2(this).classed("dragging", true);
- targetIndex = null;
- selection2.selectAll("li.member-row").style("transform", function(d2, index2) {
- var node = select_default2(this).node();
- if (index === index2) {
- return "translate(" + x + "px, " + y + "px)";
- } else if (index2 > index && d3_event.y > node.offsetTop) {
- if (targetIndex === null || index2 > targetIndex) {
- targetIndex = index2;
- }
- return "translateY(-100%)";
- } else if (index2 < index && d3_event.y < node.offsetTop + node.offsetHeight) {
- if (targetIndex === null || index2 < targetIndex) {
- targetIndex = index2;
- }
- return "translateY(100%)";
- }
- return null;
+ presetPane.call(presetList.autofocus(true));
+ };
+ inspector.setPreset = function(preset) {
+ if (preset && preset.id === "type/multipolygon") {
+ presetPane.call(presetList.autofocus(true));
+ } else {
+ editorPane.classed("hide", false);
+ wrap2.transition().styleTween("right", function() {
+ return value_default("-100%", "0%");
+ }).on("end", function() {
+ presetPane.classed("hide", true);
});
- }).on("end", function(d3_event, d) {
- if (!select_default2(this).classed("dragging"))
- return;
- var index = items.nodes().indexOf(this);
- select_default2(this).classed("dragging", false);
- selection2.selectAll("li.member-row").style("transform", null);
- if (targetIndex !== null) {
- context.perform(actionMoveMember(d.relation.id, index, targetIndex), _t("operations.reorder_members.annotation"));
- context.validator().validate();
- }
- }));
- function bindTypeahead(d) {
- var row = select_default2(this);
- var role = row.selectAll("input.member-role");
- var origValue = role.property("value");
- function sort(value, data) {
- var sameletter = [];
- var other = [];
- for (var i2 = 0; i2 < data.length; i2++) {
- if (data[i2].value.substring(0, value.length) === value) {
- sameletter.push(data[i2]);
- } else {
- other.push(data[i2]);
- }
- }
- return sameletter.concat(other);
+ if (preset) {
+ entityEditor.presets([preset]);
}
- role.call(uiCombobox(context, "member-role").fetcher(function(role2, callback) {
- var geometry;
- if (d.member) {
- geometry = context.graph().geometry(d.member.id);
- } else if (d.type === "relation") {
- geometry = "relation";
- } else if (d.type === "way") {
- geometry = "line";
- } else {
- geometry = "point";
- }
- var rtype = entity.tags.type;
- taginfo.roles({
- debounce: true,
- rtype: rtype || "",
- geometry,
- query: role2
- }, function(err, data) {
- if (!err)
- callback(sort(role2, data));
- });
- }).on("cancel", function() {
- role.property("value", origValue);
- }));
- }
- function unbind() {
- var row = select_default2(this);
- row.selectAll("input.member-role").call(uiCombobox.off, context);
+ editorPane.call(entityEditor);
}
- }
- section.entityIDs = function(val) {
- if (!arguments.length)
- return _entityIDs;
+ };
+ inspector.state = function(val) {
+ if (!arguments.length) return _state;
+ _state = val;
+ entityEditor.state(_state);
+ context.container().selectAll(".field-help-body").remove();
+ return inspector;
+ };
+ inspector.entityIDs = function(val) {
+ if (!arguments.length) return _entityIDs;
_entityIDs = val;
- return section;
+ return inspector;
};
- return section;
- }
-
- // modules/actions/delete_members.js
- function actionDeleteMembers(relationId, memberIndexes) {
- return function(graph) {
- memberIndexes.sort((a, b) => b - a);
- for (var i2 in memberIndexes) {
- graph = actionDeleteMember(relationId, memberIndexes[i2])(graph);
- }
- return graph;
+ inspector.newFeature = function(val) {
+ if (!arguments.length) return _newFeature;
+ _newFeature = val;
+ return inspector;
};
+ return inspector;
}
- // modules/ui/sections/raw_membership_editor.js
- function uiSectionRawMembershipEditor(context) {
- var section = uiSection("raw-membership-editor", context).shouldDisplay(function() {
- return _entityIDs && _entityIDs.length;
- }).label(function() {
- var parents = getSharedParentRelations();
- var gt = parents.length > _maxMemberships ? ">" : "";
- var count = gt + parents.slice(0, _maxMemberships).length;
- return _t.html("inspector.title_count", { title: { html: _t.html("inspector.relations") }, count });
- }).disclosureContent(renderDisclosureContent);
- var taginfo = services.taginfo;
- var nearbyCombo = uiCombobox(context, "parent-relation").minItems(1).fetcher(fetchNearbyRelations).itemsMouseEnter(function(d3_event, d) {
- if (d.relation)
- utilHighlightEntities([d.relation.id], true, context);
- }).itemsMouseLeave(function(d3_event, d) {
- if (d.relation)
- utilHighlightEntities([d.relation.id], false, context);
- });
- var _inChange = false;
- var _entityIDs = [];
- var _showBlank;
- var _maxMemberships = 1e3;
- function getSharedParentRelations() {
- var parents = [];
- for (var i2 = 0; i2 < _entityIDs.length; i2++) {
- var entity = context.graph().hasEntity(_entityIDs[i2]);
- if (!entity)
- continue;
- if (i2 === 0) {
- parents = context.graph().parentRelations(entity);
- } else {
- parents = utilArrayIntersection(parents, context.graph().parentRelations(entity));
- }
- if (!parents.length)
- break;
- }
- return parents;
- }
- function getMemberships() {
- var memberships = [];
- var relations = getSharedParentRelations().slice(0, _maxMemberships);
- var isMultiselect = _entityIDs.length > 1;
- var i2, relation, membership, index, member, indexedMember;
- for (i2 = 0; i2 < relations.length; i2++) {
- relation = relations[i2];
- membership = {
- relation,
- members: [],
- hash: osmEntity.key(relation)
- };
- for (index = 0; index < relation.members.length; index++) {
- member = relation.members[index];
- if (_entityIDs.indexOf(member.id) !== -1) {
- indexedMember = Object.assign({}, member, { index });
- membership.members.push(indexedMember);
- membership.hash += "," + index.toString();
- if (!isMultiselect) {
- memberships.push(membership);
- membership = {
- relation,
- members: [],
- hash: osmEntity.key(relation)
- };
- }
- }
- }
- if (membership.members.length)
- memberships.push(membership);
+ // modules/ui/keepRight_details.js
+ function uiKeepRightDetails(context) {
+ let _qaItem;
+ function issueDetail(d2) {
+ const { itemType, parentIssueType } = d2;
+ const unknown = { html: _t.html("inspector.unknown") };
+ let replacements = d2.replacements || {};
+ replacements.default = unknown;
+ if (_mainLocalizer.hasTextForStringId("QA.keepRight.errorTypes.".concat(itemType, ".title"))) {
+ return _t.html("QA.keepRight.errorTypes.".concat(itemType, ".description"), replacements);
+ } else {
+ return _t.html("QA.keepRight.errorTypes.".concat(parentIssueType, ".description"), replacements);
}
- memberships.forEach(function(membership2) {
- membership2.domId = utilUniqueDomId("membership-" + membership2.relation.id);
- var roles = [];
- membership2.members.forEach(function(member2) {
- if (roles.indexOf(member2.role) === -1)
- roles.push(member2.role);
- });
- membership2.role = roles.length === 1 ? roles[0] : roles;
- });
- return memberships;
- }
- function selectRelation(d3_event, d) {
- d3_event.preventDefault();
- utilHighlightEntities([d.relation.id], false, context);
- context.enter(modeSelect(context, [d.relation.id]));
- }
- function zoomToRelation(d3_event, d) {
- d3_event.preventDefault();
- var entity = context.entity(d.relation.id);
- context.map().zoomToEase(entity);
- utilHighlightEntities([d.relation.id], true, context);
}
- function changeRole(d3_event, d) {
- if (d === 0)
- return;
- if (_inChange)
- return;
- var newRole = context.cleanRelationRole(select_default2(this).property("value"));
- if (!newRole.trim() && typeof d.role !== "string")
- return;
- var membersToUpdate = d.members.filter(function(member) {
- return member.role !== newRole;
+ function keepRightDetails(selection2) {
+ const details = selection2.selectAll(".error-details").data(
+ _qaItem ? [_qaItem] : [],
+ (d2) => "".concat(d2.id, "-").concat(d2.status || 0)
+ );
+ details.exit().remove();
+ const detailsEnter = details.enter().append("div").attr("class", "error-details qa-details-container");
+ const descriptionEnter = detailsEnter.append("div").attr("class", "qa-details-subsection");
+ descriptionEnter.append("h4").call(_t.append("QA.keepRight.detail_description"));
+ descriptionEnter.append("div").attr("class", "qa-details-description-text").html(issueDetail);
+ let relatedEntities = [];
+ descriptionEnter.selectAll(".error_entity_link, .error_object_link").attr("href", "#").each(function() {
+ const link3 = select_default2(this);
+ const isObjectLink = link3.classed("error_object_link");
+ const entityID = isObjectLink ? utilEntityRoot(_qaItem.objectType) + _qaItem.objectId : this.textContent;
+ const entity = context.hasEntity(entityID);
+ relatedEntities.push(entityID);
+ link3.on("mouseenter", () => {
+ utilHighlightEntities([entityID], true, context);
+ }).on("mouseleave", () => {
+ utilHighlightEntities([entityID], false, context);
+ }).on("click", (d3_event) => {
+ d3_event.preventDefault();
+ utilHighlightEntities([entityID], false, context);
+ const osmlayer = context.layers().layer("osm");
+ if (!osmlayer.enabled()) {
+ osmlayer.enabled(true);
+ }
+ context.map().centerZoomEase(_qaItem.loc, 20);
+ if (entity) {
+ context.enter(modeSelect(context, [entityID]));
+ } else {
+ context.loadEntity(entityID, (err, result) => {
+ if (err) return;
+ const entity2 = result.data.find((e3) => e3.id === entityID);
+ if (entity2) context.enter(modeSelect(context, [entityID]));
+ });
+ }
+ });
+ if (entity) {
+ let name = utilDisplayName(entity);
+ if (!name && !isObjectLink) {
+ const preset = _mainPresetIndex.match(entity, context.graph());
+ name = preset && !preset.isFallback() && preset.name();
+ }
+ if (name) {
+ this.innerText = name;
+ }
+ }
});
- if (membersToUpdate.length) {
- _inChange = true;
- context.perform(function actionChangeMemberRoles(graph) {
- membersToUpdate.forEach(function(member) {
- var newMember = Object.assign({}, member, { role: newRole });
- delete newMember.index;
- graph = actionChangeMember(d.relation.id, newMember, member.index)(graph);
- });
- return graph;
- }, _t("operations.change_role.annotation", {
- n: membersToUpdate.length
- }));
- context.validator().validate();
- }
- _inChange = false;
+ context.features().forceVisible(relatedEntities);
+ context.map().pan([0, 0]);
}
- function addMembership(d, role) {
- this.blur();
- _showBlank = false;
- function actionAddMembers(relationId, ids, role2) {
- return function(graph) {
- for (var i2 in ids) {
- var member = { id: ids[i2], type: graph.entity(ids[i2]).type, role: role2 };
- graph = actionAddMember(relationId, member)(graph);
- }
- return graph;
- };
- }
- if (d.relation) {
- context.perform(actionAddMembers(d.relation.id, _entityIDs, role), _t("operations.add_member.annotation", {
- n: _entityIDs.length
- }));
- context.validator().validate();
+ keepRightDetails.issue = function(val) {
+ if (!arguments.length) return _qaItem;
+ _qaItem = val;
+ return keepRightDetails;
+ };
+ return keepRightDetails;
+ }
+
+ // modules/ui/keepRight_header.js
+ function uiKeepRightHeader() {
+ let _qaItem;
+ function issueTitle(d2) {
+ const { itemType, parentIssueType } = d2;
+ const unknown = _t.html("inspector.unknown");
+ let replacements = d2.replacements || {};
+ replacements.default = { html: unknown };
+ if (_mainLocalizer.hasTextForStringId("QA.keepRight.errorTypes.".concat(itemType, ".title"))) {
+ return _t.html("QA.keepRight.errorTypes.".concat(itemType, ".title"), replacements);
} else {
- var relation = osmRelation();
- context.perform(actionAddEntity(relation), actionAddMembers(relation.id, _entityIDs, role), _t("operations.add.annotation.relation"));
- context.enter(modeSelect(context, [relation.id]).newFeature(true));
+ return _t.html("QA.keepRight.errorTypes.".concat(parentIssueType, ".title"), replacements);
}
}
- function deleteMembership(d3_event, d) {
- this.blur();
- if (d === 0)
- return;
- utilHighlightEntities([d.relation.id], false, context);
- var indexes = d.members.map(function(member) {
- return member.index;
- });
- context.perform(actionDeleteMembers(d.relation.id, indexes), _t("operations.delete_member.annotation", {
- n: _entityIDs.length
- }));
- context.validator().validate();
+ function keepRightHeader(selection2) {
+ const header = selection2.selectAll(".qa-header").data(
+ _qaItem ? [_qaItem] : [],
+ (d2) => "".concat(d2.id, "-").concat(d2.status || 0)
+ );
+ header.exit().remove();
+ const headerEnter = header.enter().append("div").attr("class", "qa-header");
+ const iconEnter = headerEnter.append("div").attr("class", "qa-header-icon").classed("new", (d2) => d2.id < 0);
+ iconEnter.append("div").attr("class", (d2) => "preset-icon-28 qaItem ".concat(d2.service, " itemId-").concat(d2.id, " itemType-").concat(d2.parentIssueType)).call(svgIcon("#iD-icon-bolt", "qaItem-fill"));
+ headerEnter.append("div").attr("class", "qa-header-label").html(issueTitle);
}
- function fetchNearbyRelations(q, callback) {
- var newRelation = {
- relation: null,
- value: _t("inspector.new_relation"),
- display: _t.html("inspector.new_relation")
- };
- var entityID = _entityIDs[0];
- var result = [];
- var graph = context.graph();
- function baseDisplayLabel(entity) {
- var matched = _mainPresetIndex.match(entity, graph);
- var presetName = matched && matched.name() || _t("inspector.relation");
- var entityName = utilDisplayName(entity) || "";
- return presetName + " " + entityName;
+ keepRightHeader.issue = function(val) {
+ if (!arguments.length) return _qaItem;
+ _qaItem = val;
+ return keepRightHeader;
+ };
+ return keepRightHeader;
+ }
+
+ // modules/ui/view_on_keepRight.js
+ function uiViewOnKeepRight() {
+ let _qaItem;
+ function viewOnKeepRight(selection2) {
+ let url;
+ if (services.keepRight && _qaItem instanceof QAItem) {
+ url = services.keepRight.issueURL(_qaItem);
}
- var explicitRelation = q && context.hasEntity(q.toLowerCase());
- if (explicitRelation && explicitRelation.type === "relation" && explicitRelation.id !== entityID) {
- result.push({
- relation: explicitRelation,
- value: baseDisplayLabel(explicitRelation) + " " + explicitRelation.id
- });
- } else {
- context.history().intersects(context.map().extent()).forEach(function(entity) {
- if (entity.type !== "relation" || entity.id === entityID)
- return;
- var value = baseDisplayLabel(entity);
- if (q && (value + " " + entity.id).toLowerCase().indexOf(q.toLowerCase()) === -1)
- return;
- result.push({ relation: entity, value });
- });
- result.sort(function(a, b) {
- return osmRelation.creationOrder(a.relation, b.relation);
- });
- var dupeGroups = Object.values(utilArrayGroupBy(result, "value")).filter(function(v) {
- return v.length > 1;
- });
- dupeGroups.forEach(function(group) {
- group.forEach(function(obj) {
- obj.value += " " + obj.relation.id;
- });
- });
+ const link3 = selection2.selectAll(".view-on-keepRight").data(url ? [url] : []);
+ link3.exit().remove();
+ const linkEnter = link3.enter().append("a").attr("class", "view-on-keepRight").attr("target", "_blank").attr("rel", "noopener").attr("href", (d2) => d2).call(svgIcon("#iD-icon-out-link", "inline"));
+ linkEnter.append("span").call(_t.append("inspector.view_on_keepRight"));
+ }
+ viewOnKeepRight.what = function(val) {
+ if (!arguments.length) return _qaItem;
+ _qaItem = val;
+ return viewOnKeepRight;
+ };
+ return viewOnKeepRight;
+ }
+
+ // modules/ui/keepRight_editor.js
+ function uiKeepRightEditor(context) {
+ const dispatch14 = dispatch_default("change");
+ const qaDetails = uiKeepRightDetails(context);
+ const qaHeader = uiKeepRightHeader(context);
+ let _qaItem;
+ function keepRightEditor(selection2) {
+ const headerEnter = selection2.selectAll(".header").data([0]).enter().append("div").attr("class", "header fillL");
+ headerEnter.append("button").attr("class", "close").attr("title", _t("icons.close")).on("click", () => context.enter(modeBrowse(context))).call(svgIcon("#iD-icon-close"));
+ headerEnter.append("h2").call(_t.append("QA.keepRight.title"));
+ let body = selection2.selectAll(".body").data([0]);
+ body = body.enter().append("div").attr("class", "body").merge(body);
+ const editor = body.selectAll(".qa-editor").data([0]);
+ editor.enter().append("div").attr("class", "modal-section qa-editor").merge(editor).call(qaHeader.issue(_qaItem)).call(qaDetails.issue(_qaItem)).call(keepRightSaveSection);
+ const footer = selection2.selectAll(".footer").data([0]);
+ footer.enter().append("div").attr("class", "footer").merge(footer).call(uiViewOnKeepRight(context).what(_qaItem));
+ }
+ function keepRightSaveSection(selection2) {
+ const isSelected = _qaItem && _qaItem.id === context.selectedErrorID();
+ const isShown = _qaItem && (isSelected || _qaItem.newComment || _qaItem.comment);
+ let saveSection = selection2.selectAll(".qa-save").data(
+ isShown ? [_qaItem] : [],
+ (d2) => "".concat(d2.id, "-").concat(d2.status || 0)
+ );
+ saveSection.exit().remove();
+ const saveSectionEnter = saveSection.enter().append("div").attr("class", "qa-save save-section cf");
+ saveSectionEnter.append("h4").attr("class", ".qa-save-header").call(_t.append("QA.keepRight.comment"));
+ saveSectionEnter.append("textarea").attr("class", "new-comment-input").attr("placeholder", _t("QA.keepRight.comment_placeholder")).attr("maxlength", 1e3).property("value", (d2) => d2.newComment || d2.comment).call(utilNoAuto).on("input", changeInput).on("blur", changeInput);
+ saveSection = saveSectionEnter.merge(saveSection).call(qaSaveButtons);
+ function changeInput() {
+ const input = select_default2(this);
+ let val = input.property("value").trim();
+ if (val === _qaItem.comment) {
+ val = void 0;
+ }
+ _qaItem = _qaItem.update({ newComment: val });
+ const qaService = services.keepRight;
+ if (qaService) {
+ qaService.replaceItem(_qaItem);
+ }
+ saveSection.call(qaSaveButtons);
}
- result.forEach(function(obj) {
- obj.title = obj.value;
- });
- result.unshift(newRelation);
- callback(result);
}
- function renderDisclosureContent(selection2) {
- var memberships = getMemberships();
- var list = selection2.selectAll(".member-list").data([0]);
- list = list.enter().append("ul").attr("class", "member-list").merge(list);
- var items = list.selectAll("li.member-row-normal").data(memberships, function(d) {
- return d.hash;
- });
- items.exit().each(unbind).remove();
- var itemsEnter = items.enter().append("li").attr("class", "member-row member-row-normal form-field");
- itemsEnter.on("mouseover", function(d3_event, d) {
- utilHighlightEntities([d.relation.id], true, context);
- }).on("mouseout", function(d3_event, d) {
- utilHighlightEntities([d.relation.id], false, context);
- });
- var labelEnter = itemsEnter.append("label").attr("class", "field-label").attr("for", function(d) {
- return d.domId;
+ function qaSaveButtons(selection2) {
+ const isSelected = _qaItem && _qaItem.id === context.selectedErrorID();
+ let buttonSection = selection2.selectAll(".buttons").data(isSelected ? [_qaItem] : [], (d2) => d2.status + d2.id);
+ buttonSection.exit().remove();
+ const buttonEnter = buttonSection.enter().append("div").attr("class", "buttons");
+ buttonEnter.append("button").attr("class", "button comment-button action").call(_t.append("QA.keepRight.save_comment"));
+ buttonEnter.append("button").attr("class", "button close-button action");
+ buttonEnter.append("button").attr("class", "button ignore-button action");
+ buttonSection = buttonSection.merge(buttonEnter);
+ buttonSection.select(".comment-button").attr("disabled", (d2) => d2.newComment ? null : true).on("click.comment", function(d3_event, d2) {
+ this.blur();
+ const qaService = services.keepRight;
+ if (qaService) {
+ qaService.postUpdate(d2, (err, item) => dispatch14.call("change", item));
+ }
});
- var labelLink = labelEnter.append("span").attr("class", "label-text").append("a").attr("href", "#").on("click", selectRelation);
- labelLink.append("span").attr("class", "member-entity-type").text(function(d) {
- var matched = _mainPresetIndex.match(d.relation, context.graph());
- return matched && matched.name() || _t.html("inspector.relation");
+ buttonSection.select(".close-button").html((d2) => {
+ const andComment = d2.newComment ? "_comment" : "";
+ return _t.html("QA.keepRight.close".concat(andComment));
+ }).on("click.close", function(d3_event, d2) {
+ this.blur();
+ const qaService = services.keepRight;
+ if (qaService) {
+ d2.newStatus = "ignore_t";
+ qaService.postUpdate(d2, (err, item) => dispatch14.call("change", item));
+ }
});
- labelLink.append("span").attr("class", "member-entity-name").text(function(d) {
- return utilDisplayName(d.relation);
+ buttonSection.select(".ignore-button").html((d2) => {
+ const andComment = d2.newComment ? "_comment" : "";
+ return _t.html("QA.keepRight.ignore".concat(andComment));
+ }).on("click.ignore", function(d3_event, d2) {
+ this.blur();
+ const qaService = services.keepRight;
+ if (qaService) {
+ d2.newStatus = "ignore";
+ qaService.postUpdate(d2, (err, item) => dispatch14.call("change", item));
+ }
});
- labelEnter.append("button").attr("class", "remove member-delete").attr("title", _t("icons.remove")).call(svgIcon("#iD-operation-delete")).on("click", deleteMembership);
- labelEnter.append("button").attr("class", "member-zoom").attr("title", _t("icons.zoom_to")).call(svgIcon("#iD-icon-framed-dot", "monochrome")).on("click", zoomToRelation);
- var wrapEnter = itemsEnter.append("div").attr("class", "form-field-input-wrap form-field-input-member");
- wrapEnter.append("input").attr("class", "member-role").attr("id", function(d) {
- return d.domId;
- }).property("type", "text").property("value", function(d) {
- return typeof d.role === "string" ? d.role : "";
- }).attr("title", function(d) {
- return Array.isArray(d.role) ? d.role.filter(Boolean).join("\n") : d.role;
- }).attr("placeholder", function(d) {
- return Array.isArray(d.role) ? _t("inspector.multiple_roles") : _t("inspector.role");
- }).classed("mixed", function(d) {
- return Array.isArray(d.role);
- }).call(utilNoAuto).on("blur", changeRole).on("change", changeRole);
- if (taginfo) {
- wrapEnter.each(bindTypeahead);
+ }
+ keepRightEditor.error = function(val) {
+ if (!arguments.length) return _qaItem;
+ _qaItem = val;
+ return keepRightEditor;
+ };
+ return utilRebind(keepRightEditor, dispatch14, "on");
+ }
+
+ // modules/ui/osmose_details.js
+ function uiOsmoseDetails(context) {
+ let _qaItem;
+ function issueString(d2, type2) {
+ if (!d2) return "";
+ const s2 = services.osmose.getStrings(d2.itemType);
+ return type2 in s2 ? s2[type2] : "";
+ }
+ function osmoseDetails(selection2) {
+ const details = selection2.selectAll(".error-details").data(
+ _qaItem ? [_qaItem] : [],
+ (d2) => "".concat(d2.id, "-").concat(d2.status || 0)
+ );
+ details.exit().remove();
+ const detailsEnter = details.enter().append("div").attr("class", "error-details qa-details-container");
+ if (issueString(_qaItem, "detail")) {
+ const div = detailsEnter.append("div").attr("class", "qa-details-subsection");
+ div.append("h4").call(_t.append("QA.keepRight.detail_description"));
+ div.append("p").attr("class", "qa-details-description-text").html((d2) => issueString(d2, "detail")).selectAll("a").attr("rel", "noopener").attr("target", "_blank");
}
- var newMembership = list.selectAll(".member-row-new").data(_showBlank ? [0] : []);
- newMembership.exit().remove();
- var newMembershipEnter = newMembership.enter().append("li").attr("class", "member-row member-row-new form-field");
- var newLabelEnter = newMembershipEnter.append("label").attr("class", "field-label");
- newLabelEnter.append("input").attr("placeholder", _t("inspector.choose_relation")).attr("type", "text").attr("class", "member-entity-input").call(utilNoAuto);
- newLabelEnter.append("button").attr("class", "remove member-delete").attr("title", _t("icons.remove")).call(svgIcon("#iD-operation-delete")).on("click", function() {
- list.selectAll(".member-row-new").remove();
- });
- var newWrapEnter = newMembershipEnter.append("div").attr("class", "form-field-input-wrap form-field-input-member");
- newWrapEnter.append("input").attr("class", "member-role").property("type", "text").attr("placeholder", _t("inspector.role")).call(utilNoAuto);
- newMembership = newMembership.merge(newMembershipEnter);
- newMembership.selectAll(".member-entity-input").on("blur", cancelEntity).call(nearbyCombo.on("accept", acceptEntity).on("cancel", cancelEntity));
- var addRow = selection2.selectAll(".add-row").data([0]);
- var addRowEnter = addRow.enter().append("div").attr("class", "add-row");
- var addRelationButton = addRowEnter.append("button").attr("class", "add-relation").attr("aria-label", _t("inspector.add_to_relation"));
- addRelationButton.call(svgIcon("#iD-icon-plus", "light"));
- addRelationButton.call(uiTooltip().title(_t.html("inspector.add_to_relation")).placement(_mainLocalizer.textDirection() === "ltr" ? "right" : "left"));
- addRowEnter.append("div").attr("class", "space-value");
- addRowEnter.append("div").attr("class", "space-buttons");
- addRow = addRow.merge(addRowEnter);
- addRow.select(".add-relation").on("click", function() {
- _showBlank = true;
- section.reRender();
- list.selectAll(".member-entity-input").node().focus();
- });
- function acceptEntity(d) {
- if (!d) {
- cancelEntity();
- return;
- }
- if (d.relation)
- utilHighlightEntities([d.relation.id], false, context);
- var role = context.cleanRelationRole(list.selectAll(".member-row-new .member-role").property("value"));
- addMembership(d, role);
+ const detailsDiv = detailsEnter.append("div").attr("class", "qa-details-subsection");
+ const elemsDiv = detailsEnter.append("div").attr("class", "qa-details-subsection");
+ if (issueString(_qaItem, "fix")) {
+ const div = detailsEnter.append("div").attr("class", "qa-details-subsection");
+ div.append("h4").call(_t.append("QA.osmose.fix_title"));
+ div.append("p").html((d2) => issueString(d2, "fix")).selectAll("a").attr("rel", "noopener").attr("target", "_blank");
}
- function cancelEntity() {
- var input = newMembership.selectAll(".member-entity-input");
- input.property("value", "");
- context.surface().selectAll(".highlighted").classed("highlighted", false);
+ if (issueString(_qaItem, "trap")) {
+ const div = detailsEnter.append("div").attr("class", "qa-details-subsection");
+ div.append("h4").call(_t.append("QA.osmose.trap_title"));
+ div.append("p").html((d2) => issueString(d2, "trap")).selectAll("a").attr("rel", "noopener").attr("target", "_blank");
}
- function bindTypeahead(d) {
- var row = select_default2(this);
- var role = row.selectAll("input.member-role");
- var origValue = role.property("value");
- function sort(value, data) {
- var sameletter = [];
- var other = [];
- for (var i2 = 0; i2 < data.length; i2++) {
- if (data[i2].value.substring(0, value.length) === value) {
- sameletter.push(data[i2]);
+ const thisItem = _qaItem;
+ services.osmose.loadIssueDetail(_qaItem).then((d2) => {
+ if (!d2.elems || d2.elems.length === 0) return;
+ if (context.selectedErrorID() !== thisItem.id && context.container().selectAll(".qaItem.osmose.hover.itemId-".concat(thisItem.id)).empty()) return;
+ if (d2.detail) {
+ detailsDiv.append("h4").call(_t.append("QA.osmose.detail_title"));
+ detailsDiv.append("p").html((d4) => d4.detail).selectAll("a").attr("rel", "noopener").attr("target", "_blank");
+ }
+ elemsDiv.append("h4").call(_t.append("QA.osmose.elems_title"));
+ elemsDiv.append("ul").selectAll("li").data(d2.elems).enter().append("li").append("a").attr("href", "#").attr("class", "error_entity_link").text((d4) => d4).each(function() {
+ const link3 = select_default2(this);
+ const entityID = this.textContent;
+ const entity = context.hasEntity(entityID);
+ link3.on("mouseenter", () => {
+ utilHighlightEntities([entityID], true, context);
+ }).on("mouseleave", () => {
+ utilHighlightEntities([entityID], false, context);
+ }).on("click", (d3_event) => {
+ d3_event.preventDefault();
+ utilHighlightEntities([entityID], false, context);
+ const osmlayer = context.layers().layer("osm");
+ if (!osmlayer.enabled()) {
+ osmlayer.enabled(true);
+ }
+ context.map().centerZoom(d2.loc, 20);
+ if (entity) {
+ context.enter(modeSelect(context, [entityID]));
} else {
- other.push(data[i2]);
+ context.loadEntity(entityID, (err, result) => {
+ if (err) return;
+ const entity2 = result.data.find((e3) => e3.id === entityID);
+ if (entity2) context.enter(modeSelect(context, [entityID]));
+ });
}
- }
- return sameletter.concat(other);
- }
- role.call(uiCombobox(context, "member-role").fetcher(function(role2, callback) {
- var rtype = d.relation.tags.type;
- taginfo.roles({
- debounce: true,
- rtype: rtype || "",
- geometry: context.graph().geometry(_entityIDs[0]),
- query: role2
- }, function(err, data) {
- if (!err)
- callback(sort(role2, data));
});
- }).on("cancel", function() {
- role.property("value", origValue);
- }));
- }
- function unbind() {
- var row = select_default2(this);
- row.selectAll("input.member-role").call(uiCombobox.off, context);
- }
+ if (entity) {
+ let name = utilDisplayName(entity);
+ if (!name) {
+ const preset = _mainPresetIndex.match(entity, context.graph());
+ name = preset && !preset.isFallback() && preset.name();
+ }
+ if (name) {
+ this.innerText = name;
+ }
+ }
+ });
+ context.features().forceVisible(d2.elems);
+ context.map().pan([0, 0]);
+ }).catch((err) => {
+ console.log(err);
+ });
}
- section.entityIDs = function(val) {
- if (!arguments.length)
- return _entityIDs;
- _entityIDs = val;
- _showBlank = false;
- return section;
+ osmoseDetails.issue = function(val) {
+ if (!arguments.length) return _qaItem;
+ _qaItem = val;
+ return osmoseDetails;
};
- return section;
+ return osmoseDetails;
}
- // modules/ui/sections/selection_list.js
- function uiSectionSelectionList(context) {
- var _selectedIDs = [];
- var section = uiSection("selected-features", context).shouldDisplay(function() {
- return _selectedIDs.length > 1;
- }).label(function() {
- return _t.html("inspector.title_count", { title: { html: _t.html("inspector.features") }, count: _selectedIDs.length });
- }).disclosureContent(renderDisclosureContent);
- context.history().on("change.selectionList", function(difference) {
- if (difference) {
- section.reRender();
+ // modules/ui/osmose_header.js
+ function uiOsmoseHeader() {
+ let _qaItem;
+ function issueTitle(d2) {
+ const unknown = _t("inspector.unknown");
+ if (!d2) return unknown;
+ const s2 = services.osmose.getStrings(d2.itemType);
+ return "title" in s2 ? s2.title : unknown;
+ }
+ function osmoseHeader(selection2) {
+ const header = selection2.selectAll(".qa-header").data(
+ _qaItem ? [_qaItem] : [],
+ (d2) => "".concat(d2.id, "-").concat(d2.status || 0)
+ );
+ header.exit().remove();
+ const headerEnter = header.enter().append("div").attr("class", "qa-header");
+ const svgEnter = headerEnter.append("div").attr("class", "qa-header-icon").classed("new", (d2) => d2.id < 0).append("svg").attr("width", "20px").attr("height", "30px").attr("viewbox", "0 0 20 30").attr("class", (d2) => "preset-icon-28 qaItem ".concat(d2.service, " itemId-").concat(d2.id, " itemType-").concat(d2.itemType));
+ svgEnter.append("polygon").attr("fill", (d2) => services.osmose.getColor(d2.item)).attr("class", "qaItem-fill").attr("points", "16,3 4,3 1,6 1,17 4,20 7,20 10,27 13,20 16,20 19,17.033 19,6");
+ svgEnter.append("use").attr("class", "icon-annotation").attr("width", "12px").attr("height", "12px").attr("transform", "translate(4, 5.5)").attr("xlink:href", (d2) => d2.icon ? "#" + d2.icon : "");
+ headerEnter.append("div").attr("class", "qa-header-label").text(issueTitle);
+ }
+ osmoseHeader.issue = function(val) {
+ if (!arguments.length) return _qaItem;
+ _qaItem = val;
+ return osmoseHeader;
+ };
+ return osmoseHeader;
+ }
+
+ // modules/ui/view_on_osmose.js
+ function uiViewOnOsmose() {
+ let _qaItem;
+ function viewOnOsmose(selection2) {
+ let url;
+ if (services.osmose && _qaItem instanceof QAItem) {
+ url = services.osmose.itemURL(_qaItem);
}
- });
- section.entityIDs = function(val) {
- if (!arguments.length)
- return _selectedIDs;
- _selectedIDs = val;
- return section;
+ const link3 = selection2.selectAll(".view-on-osmose").data(url ? [url] : []);
+ link3.exit().remove();
+ const linkEnter = link3.enter().append("a").attr("class", "view-on-osmose").attr("target", "_blank").attr("rel", "noopener").attr("href", (d2) => d2).call(svgIcon("#iD-icon-out-link", "inline"));
+ linkEnter.append("span").call(_t.append("inspector.view_on_osmose"));
+ }
+ viewOnOsmose.what = function(val) {
+ if (!arguments.length) return _qaItem;
+ _qaItem = val;
+ return viewOnOsmose;
};
- function selectEntity(d3_event, entity) {
- context.enter(modeSelect(context, [entity.id]));
+ return viewOnOsmose;
+ }
+
+ // modules/ui/osmose_editor.js
+ function uiOsmoseEditor(context) {
+ const dispatch14 = dispatch_default("change");
+ const qaDetails = uiOsmoseDetails(context);
+ const qaHeader = uiOsmoseHeader(context);
+ let _qaItem;
+ function osmoseEditor(selection2) {
+ const header = selection2.selectAll(".header").data([0]);
+ const headerEnter = header.enter().append("div").attr("class", "header fillL");
+ headerEnter.append("button").attr("class", "close").attr("title", _t("icons.close")).on("click", () => context.enter(modeBrowse(context))).call(svgIcon("#iD-icon-close"));
+ headerEnter.append("h2").call(_t.append("QA.osmose.title"));
+ let body = selection2.selectAll(".body").data([0]);
+ body = body.enter().append("div").attr("class", "body").merge(body);
+ let editor = body.selectAll(".qa-editor").data([0]);
+ editor.enter().append("div").attr("class", "modal-section qa-editor").merge(editor).call(qaHeader.issue(_qaItem)).call(qaDetails.issue(_qaItem)).call(osmoseSaveSection);
+ const footer = selection2.selectAll(".footer").data([0]);
+ footer.enter().append("div").attr("class", "footer").merge(footer).call(uiViewOnOsmose(context).what(_qaItem));
}
- function deselectEntity(d3_event, entity) {
- var selectedIDs = _selectedIDs.slice();
- var index = selectedIDs.indexOf(entity.id);
- if (index > -1) {
- selectedIDs.splice(index, 1);
- context.enter(modeSelect(context, selectedIDs));
- }
+ function osmoseSaveSection(selection2) {
+ const isSelected = _qaItem && _qaItem.id === context.selectedErrorID();
+ const isShown = _qaItem && isSelected;
+ let saveSection = selection2.selectAll(".qa-save").data(
+ isShown ? [_qaItem] : [],
+ (d2) => "".concat(d2.id, "-").concat(d2.status || 0)
+ );
+ saveSection.exit().remove();
+ const saveSectionEnter = saveSection.enter().append("div").attr("class", "qa-save save-section cf");
+ saveSection = saveSectionEnter.merge(saveSection).call(qaSaveButtons);
}
- function renderDisclosureContent(selection2) {
- var list = selection2.selectAll(".feature-list").data([0]);
- list = list.enter().append("ul").attr("class", "feature-list").merge(list);
- var entities = _selectedIDs.map(function(id2) {
- return context.hasEntity(id2);
- }).filter(Boolean);
- var items = list.selectAll(".feature-list-item").data(entities, osmEntity.key);
- items.exit().remove();
- var enter = items.enter().append("li").attr("class", "feature-list-item").each(function(d) {
- select_default2(this).on("mouseover", function() {
- utilHighlightEntities([d.id], true, context);
- }).on("mouseout", function() {
- utilHighlightEntities([d.id], false, context);
- });
- });
- var label = enter.append("button").attr("class", "label").on("click", selectEntity);
- label.append("span").attr("class", "entity-geom-icon").call(svgIcon("", "pre-text"));
- label.append("span").attr("class", "entity-type");
- label.append("span").attr("class", "entity-name");
- enter.append("button").attr("class", "close").attr("title", _t("icons.deselect")).on("click", deselectEntity).call(svgIcon("#iD-icon-close"));
- items = items.merge(enter);
- items.selectAll(".entity-geom-icon use").attr("href", function() {
- var entity = this.parentNode.parentNode.__data__;
- return "#iD-icon-" + entity.geometry(context.graph());
- });
- items.selectAll(".entity-type").text(function(entity) {
- return _mainPresetIndex.match(entity, context.graph()).name();
+ function qaSaveButtons(selection2) {
+ const isSelected = _qaItem && _qaItem.id === context.selectedErrorID();
+ let buttonSection = selection2.selectAll(".buttons").data(isSelected ? [_qaItem] : [], (d2) => d2.status + d2.id);
+ buttonSection.exit().remove();
+ const buttonEnter = buttonSection.enter().append("div").attr("class", "buttons");
+ buttonEnter.append("button").attr("class", "button close-button action");
+ buttonEnter.append("button").attr("class", "button ignore-button action");
+ buttonSection = buttonSection.merge(buttonEnter);
+ buttonSection.select(".close-button").call(_t.append("QA.keepRight.close")).on("click.close", function(d3_event, d2) {
+ this.blur();
+ const qaService = services.osmose;
+ if (qaService) {
+ d2.newStatus = "done";
+ qaService.postUpdate(d2, (err, item) => dispatch14.call("change", item));
+ }
});
- items.selectAll(".entity-name").text(function(d) {
- var entity = context.entity(d.id);
- return utilDisplayName(entity);
+ buttonSection.select(".ignore-button").call(_t.append("QA.keepRight.ignore")).on("click.ignore", function(d3_event, d2) {
+ this.blur();
+ const qaService = services.osmose;
+ if (qaService) {
+ d2.newStatus = "false";
+ qaService.postUpdate(d2, (err, item) => dispatch14.call("change", item));
+ }
});
}
- return section;
+ osmoseEditor.error = function(val) {
+ if (!arguments.length) return _qaItem;
+ _qaItem = val;
+ return osmoseEditor;
+ };
+ return utilRebind(osmoseEditor, dispatch14, "on");
}
- // modules/ui/entity_editor.js
- function uiEntityEditor(context) {
- var dispatch10 = dispatch_default("choose");
- var _state = "select";
- var _coalesceChanges = false;
- var _modified = false;
- var _base;
- var _entityIDs;
- var _activePresets = [];
- var _newFeature;
- var _sections;
- function entityEditor(selection2) {
- var combinedTags = utilCombinedTags(_entityIDs, context.graph());
- var header = selection2.selectAll(".header").data([0]);
- var headerEnter = header.enter().append("div").attr("class", "header fillL");
- var direction = _mainLocalizer.textDirection() === "rtl" ? "forward" : "backward";
- headerEnter.append("button").attr("class", "preset-reset preset-choose").attr("title", _t(`icons.${direction}`)).call(svgIcon(`#iD-icon-${direction}`));
- headerEnter.append("button").attr("class", "close").attr("title", _t("icons.close")).on("click", function() {
- context.enter(modeBrowse(context));
- }).call(svgIcon(_modified ? "#iD-icon-apply" : "#iD-icon-close"));
- headerEnter.append("h2");
- header = header.merge(headerEnter);
- header.selectAll("h2").html(_entityIDs.length === 1 ? _t.html("inspector.edit") : _t.html("inspector.edit_features"));
- header.selectAll(".preset-reset").on("click", function() {
- dispatch10.call("choose", this, _activePresets);
- });
- var body = selection2.selectAll(".inspector-body").data([0]);
- var bodyEnter = body.enter().append("div").attr("class", "entity-editor inspector-body sep-top");
- body = body.merge(bodyEnter);
- if (!_sections) {
- _sections = [
- uiSectionSelectionList(context),
- uiSectionFeatureType(context).on("choose", function(presets) {
- dispatch10.call("choose", this, presets);
- }),
- uiSectionEntityIssues(context),
- uiSectionPresetFields(context).on("change", changeTags).on("revert", revertTags),
- uiSectionRawTagEditor("raw-tag-editor", context).on("change", changeTags),
- uiSectionRawMemberEditor(context),
- uiSectionRawMembershipEditor(context)
- ];
+ // modules/ui/sidebar.js
+ function uiSidebar(context) {
+ var inspector = uiInspector(context);
+ var dataEditor = uiDataEditor(context);
+ var noteEditor = uiNoteEditor(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);
}
- _sections.forEach(function(section) {
- if (section.entityIDs) {
- section.entityIDs(_entityIDs);
- }
- if (section.presets) {
- section.presets(_activePresets);
- }
- if (section.tags) {
- section.tags(combinedTags);
+ 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 x2 = containerLocGetter(d3_event)[0] - dragOffset;
+ sidebarWidth = isRTL ? containerWidth - x2 : x2;
+ 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]);
+ }
}
- if (section.state) {
- section.state(_state);
+ }
+ 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);
+ }
}
- body.call(section.render);
- });
- context.history().on("change.entity-editor", historyChanged);
- function historyChanged(difference) {
- if (selection2.selectAll(".entity-editor").empty())
- return;
- if (_state === "hide")
- return;
- var significant = !difference || difference.didChange.properties || difference.didChange.addition || difference.didChange.deletion;
- if (!significant)
- return;
- _entityIDs = _entityIDs.filter(context.hasEntity);
- if (!_entityIDs.length)
- return;
- var priorActivePreset = _activePresets.length === 1 && _activePresets[0];
- loadActivePresets();
- var graph = context.graph();
- entityEditor.modified(_base !== graph);
- entityEditor(selection2);
- if (priorActivePreset && _activePresets.length === 1 && priorActivePreset !== _activePresets[0]) {
- context.container().selectAll(".entity-editor button.preset-reset .label").style("background-color", "#fff").transition().duration(750).style("background-color", null);
+ };
+ 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 {
+ errEditor = osmoseEditor;
+ }
+ context.container().selectAll(".qaItem." + datum2.service).classed("hover", function(d2) {
+ return d2.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();
}
}
- }
- function changeTags(entityIDs, changed, onInput) {
- var actions = [];
- for (var i2 in entityIDs) {
- var entityID = entityIDs[i2];
- var entity = context.entity(entityID);
- var tags = Object.assign({}, entity.tags);
- for (var k in changed) {
- if (!k)
- continue;
- var v = changed[k];
- if (typeof v === "object") {
- tags[k] = tags[v.oldKey];
- } else if (v !== void 0 || tags.hasOwnProperty(k)) {
- tags[k] = v;
+ 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");
}
- if (!onInput) {
- tags = utilCleanTags(tags);
+ };
+ 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);
}
- if (!(0, import_fast_deep_equal10.default)(entity.tags, tags)) {
- actions.push(actionChangeTags(entityID, tags));
+ };
+ sidebar.collapse = function(moveMap) {
+ if (!selection2.classed("collapsed")) {
+ sidebar.toggle(moveMap);
}
- }
- if (actions.length) {
- var combinedAction = function(graph) {
- actions.forEach(function(action) {
- graph = action(graph);
- });
- return graph;
- };
- var annotation = _t("operations.change_tags.annotation");
- if (_coalesceChanges) {
- context.overwrite(combinedAction, annotation);
+ };
+ 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 {
- context.perform(combinedAction, annotation);
- _coalesceChanges = !!onInput;
+ startMargin = lastMargin = -sidebarWidth;
+ endMargin = 0;
}
- }
- if (!onInput) {
- context.validator().validate();
- }
- }
- function revertTags(keys) {
- var actions = [];
- for (var i2 in _entityIDs) {
- var entityID = _entityIDs[i2];
- var original = context.graph().base().entities[entityID];
- var changed = {};
- for (var j2 in keys) {
- var key = keys[j2];
- changed[key] = original ? original.tags[key] : void 0;
+ if (!isCollapsing) {
+ selection2.classed("collapsed", isCollapsing);
}
- var entity = context.entity(entityID);
- var tags = Object.assign({}, entity.tags);
- for (var k in changed) {
- if (!k)
- continue;
- var v = changed[k];
- if (v !== void 0 || tags.hasOwnProperty(k)) {
- tags[k] = v;
+ selection2.transition().style(xMarginProperty, endMargin + "px").tween("panner", function() {
+ var i3 = number_default(startMargin, endMargin);
+ return function(t2) {
+ var dx = lastMargin - Math.round(i3(t2));
+ 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 + "%");
+ }
+ });
+ };
+ resizer.on("dblclick", function(d3_event) {
+ d3_event.preventDefault();
+ if (d3_event.sourceEvent) {
+ d3_event.sourceEvent.preventDefault();
}
- tags = utilCleanTags(tags);
- if (!(0, import_fast_deep_equal10.default)(entity.tags, tags)) {
- actions.push(actionChangeTags(entityID, tags));
- }
- }
- if (actions.length) {
- var combinedAction = function(graph) {
- actions.forEach(function(action) {
- graph = action(graph);
- });
- return graph;
- };
- var annotation = _t("operations.change_tags.annotation");
- if (_coalesceChanges) {
- context.overwrite(combinedAction, annotation);
- } else {
- context.perform(combinedAction, annotation);
- _coalesceChanges = false;
+ sidebar.toggle();
+ });
+ context.map().on("crossEditableZoom.sidebar", function(within) {
+ if (!within && !selection2.select(".inspector-hover").empty()) {
+ hover([]);
}
- }
- context.validator().validate();
+ });
}
- entityEditor.modified = function(val) {
- if (!arguments.length)
- return _modified;
- _modified = val;
- return entityEditor;
+ sidebar.showPresetList = function() {
};
- entityEditor.state = function(val) {
- if (!arguments.length)
- return _state;
- _state = val;
- return entityEditor;
+ sidebar.hover = function() {
};
- entityEditor.entityIDs = function(val) {
- if (!arguments.length)
- return _entityIDs;
- _base = context.graph();
- _coalesceChanges = false;
- if (val && _entityIDs && utilArrayIdentical(_entityIDs, val))
- return entityEditor;
- _entityIDs = val;
- loadActivePresets(true);
- return entityEditor.modified(false);
+ sidebar.hover.cancel = function() {
};
- entityEditor.newFeature = function(val) {
- if (!arguments.length)
- return _newFeature;
- _newFeature = val;
- return entityEditor;
+ sidebar.intersects = function() {
};
- function loadActivePresets(isForNewSelection) {
- var graph = context.graph();
- var counts = {};
- for (var i2 in _entityIDs) {
- var entity = graph.hasEntity(_entityIDs[i2]);
- if (!entity)
- return;
- var match = _mainPresetIndex.match(entity, graph);
- if (!counts[match.id])
- counts[match.id] = 0;
- counts[match.id] += 1;
- }
- var matches = Object.keys(counts).sort(function(p1, p2) {
- return counts[p2] - counts[p1];
- }).map(function(pID) {
- return _mainPresetIndex.item(pID);
- });
- if (!isForNewSelection) {
- var weakPreset = _activePresets.length === 1 && !_activePresets[0].isFallback() && Object.keys(_activePresets[0].addTags || {}).length === 0;
- if (weakPreset && matches.length === 1 && matches[0].isFallback())
- return;
- }
- entityEditor.presets(matches);
+ sidebar.select = function() {
+ };
+ sidebar.show = function() {
+ };
+ sidebar.hide = function() {
+ };
+ sidebar.expand = function() {
+ };
+ sidebar.collapse = function() {
+ };
+ sidebar.toggle = function() {
+ };
+ return sidebar;
+ }
+
+ // modules/ui/source_switch.js
+ function uiSourceSwitch(context) {
+ var keys2;
+ function click(d3_event) {
+ d3_event.preventDefault();
+ var osm = context.connection();
+ if (!osm) return;
+ if (context.inIntro()) return;
+ if (context.history().hasChanges() && !window.confirm(_t("source_switch.lose_changes"))) return;
+ var isLive = select_default2(this).classed("live");
+ isLive = !isLive;
+ context.enter(modeBrowse(context));
+ context.history().clearSaved();
+ context.flush();
+ select_default2(this).html(isLive ? _t.html("source_switch.live") : _t.html("source_switch.dev")).classed("live", isLive).classed("chip", isLive);
+ osm.switch(isLive ? keys2[0] : keys2[1]);
}
- entityEditor.presets = function(val) {
- if (!arguments.length)
- return _activePresets;
- if (!utilArrayIdentical(val, _activePresets)) {
- _activePresets = val;
- }
- return entityEditor;
+ var sourceSwitch = function(selection2) {
+ selection2.append("a").attr("href", "#").call(_t.append("source_switch.live")).attr("class", "live chip").on("click", click);
+ };
+ sourceSwitch.keys = function(_2) {
+ if (!arguments.length) return keys2;
+ keys2 = _2;
+ return sourceSwitch;
};
- return utilRebind(entityEditor, dispatch10, "on");
+ return sourceSwitch;
}
- // modules/ui/feature_list.js
- var sexagesimal = __toESM(require_sexagesimal());
- function uiFeatureList(context) {
- var _geocodeResults;
- function featureList(selection2) {
- var header = selection2.append("div").attr("class", "header fillL");
- header.append("h2").call(_t.append("inspector.feature_list"));
- var searchWrap = selection2.append("div").attr("class", "search-header");
- searchWrap.call(svgIcon("#iD-icon-search", "pre-text"));
- var search = searchWrap.append("input").attr("placeholder", _t("inspector.search")).attr("type", "search").call(utilNoAuto).on("keypress", keypress).on("keydown", keydown).on("input", inputevent);
- var listWrap = selection2.append("div").attr("class", "inspector-body");
- var list = listWrap.append("div").attr("class", "feature-list");
- context.on("exit.feature-list", clearSearch);
- context.map().on("drawn.feature-list", mapDrawn);
- context.keybinding().on(uiCmd("\u2318F"), focusSearch);
- function focusSearch(d3_event) {
- var mode = context.mode() && context.mode().id;
- if (mode !== "browse")
- return;
- d3_event.preventDefault();
- search.node().focus();
- }
- function keydown(d3_event) {
- if (d3_event.keyCode === 27) {
- search.node().blur();
- }
- }
- function keypress(d3_event) {
- var q = search.property("value"), items = list.selectAll(".feature-list-item");
- if (d3_event.keyCode === 13 && q.length && items.size()) {
- click(d3_event, items.datum());
- }
- }
- function inputevent() {
- _geocodeResults = void 0;
- drawList();
- }
- function clearSearch() {
- search.property("value", "");
- drawList();
- }
- function mapDrawn(e) {
- if (e.full) {
- drawList();
- }
- }
- function features2() {
- var result = [];
- var graph = context.graph();
- var visibleCenter = context.map().extent().center();
- var q = search.property("value").toLowerCase();
- if (!q)
- return result;
- var locationMatch = sexagesimal.pair(q.toUpperCase()) || q.match(/^(-?\d+\.?\d*)\s+(-?\d+\.?\d*)$/);
- if (locationMatch) {
- var loc = [parseFloat(locationMatch[0]), parseFloat(locationMatch[1])];
- result.push({
- id: -1,
- geometry: "point",
- type: _t("inspector.location"),
- name: dmsCoordinatePair([loc[1], loc[0]]),
- location: loc
- });
- }
- var idMatch = !locationMatch && q.match(/(?:^|\W)(node|way|relation|[nwr])\W?0*([1-9]\d*)(?:\W|$)/i);
- if (idMatch) {
- var elemType = idMatch[1].charAt(0);
- var elemId = idMatch[2];
- result.push({
- id: elemType + elemId,
- geometry: elemType === "n" ? "point" : elemType === "w" ? "line" : "relation",
- type: elemType === "n" ? _t("inspector.node") : elemType === "w" ? _t("inspector.way") : _t("inspector.relation"),
- name: elemId
- });
- }
- var allEntities = graph.entities;
- var localResults = [];
- for (var id2 in allEntities) {
- var entity = allEntities[id2];
- if (!entity)
- continue;
- var name2 = utilDisplayName(entity) || "";
- if (name2.toLowerCase().indexOf(q) < 0)
- continue;
- var matched = _mainPresetIndex.match(entity, graph);
- var type3 = matched && matched.name() || utilDisplayType(entity.id);
- var extent = entity.extent(graph);
- var distance = extent ? geoSphericalDistance(visibleCenter, extent.center()) : 0;
- localResults.push({
- id: entity.id,
- entity,
- geometry: entity.geometry(graph),
- type: type3,
- name: name2,
- distance
- });
- if (localResults.length > 100)
- break;
- }
- localResults = localResults.sort(function byDistance(a, b) {
- return a.distance - b.distance;
- });
- result = result.concat(localResults);
- (_geocodeResults || []).forEach(function(d) {
- if (d.osm_type && d.osm_id) {
- var id3 = osmEntity.id.fromOSM(d.osm_type, d.osm_id);
- var tags = {};
- tags[d.class] = d.type;
- var attrs = { id: id3, type: d.osm_type, tags };
- if (d.osm_type === "way") {
- attrs.nodes = ["a", "a"];
- }
- var tempEntity = osmEntity(attrs);
- var tempGraph = coreGraph([tempEntity]);
- var matched2 = _mainPresetIndex.match(tempEntity, tempGraph);
- var type4 = matched2 && matched2.name() || utilDisplayType(id3);
- result.push({
- id: tempEntity.id,
- geometry: tempEntity.geometry(tempGraph),
- type: type4,
- name: d.display_name,
- extent: new geoExtent([parseFloat(d.boundingbox[3]), parseFloat(d.boundingbox[0])], [parseFloat(d.boundingbox[2]), parseFloat(d.boundingbox[1])])
- });
- }
- });
- if (q.match(/^[0-9]+$/)) {
- result.push({
- id: "n" + q,
- geometry: "point",
- type: _t("inspector.node"),
- name: q
- });
- result.push({
- id: "w" + q,
- geometry: "line",
- type: _t("inspector.way"),
- name: q
- });
- result.push({
- id: "r" + q,
- geometry: "relation",
- type: _t("inspector.relation"),
- name: q
- });
- }
- return result;
- }
- function drawList() {
- var value = search.property("value");
- var results = features2();
- list.classed("filtered", value.length);
- var resultsIndicator = list.selectAll(".no-results-item").data([0]).enter().append("button").property("disabled", true).attr("class", "no-results-item").call(svgIcon("#iD-icon-alert", "pre-text"));
- resultsIndicator.append("span").attr("class", "entity-name");
- list.selectAll(".no-results-item .entity-name").html("").call(_t.append("geocoder.no_results_worldwide"));
- if (services.geocoder) {
- list.selectAll(".geocode-item").data([0]).enter().append("button").attr("class", "geocode-item secondary-action").on("click", geocoderSearch).append("div").attr("class", "label").append("span").attr("class", "entity-name").call(_t.append("geocoder.search"));
- }
- list.selectAll(".no-results-item").style("display", value.length && !results.length ? "block" : "none");
- list.selectAll(".geocode-item").style("display", value && _geocodeResults === void 0 ? "block" : "none");
- list.selectAll(".feature-list-item").data([-1]).remove();
- var items = list.selectAll(".feature-list-item").data(results, function(d) {
- return d.id;
- });
- var enter = items.enter().insert("button", ".geocode-item").attr("class", "feature-list-item").on("mouseover", mouseover).on("mouseout", mouseout).on("click", click);
- var label = enter.append("div").attr("class", "label");
- label.each(function(d) {
- select_default2(this).call(svgIcon("#iD-icon-" + d.geometry, "pre-text"));
- });
- label.append("span").attr("class", "entity-type").text(function(d) {
- return d.type;
- });
- label.append("span").attr("class", "entity-name").text(function(d) {
- return d.name;
- });
- enter.style("opacity", 0).transition().style("opacity", 1);
- items.order();
- items.exit().remove();
- }
- function mouseover(d3_event, d) {
- if (d.id === -1)
- return;
- utilHighlightEntities([d.id], true, context);
- }
- function mouseout(d3_event, d) {
- if (d.id === -1)
- return;
- utilHighlightEntities([d.id], false, context);
- }
- function click(d3_event, d) {
- d3_event.preventDefault();
- if (d.location) {
- context.map().centerZoomEase([d.location[1], d.location[0]], 19);
- } else if (d.entity) {
- utilHighlightEntities([d.id], false, context);
- context.enter(modeSelect(context, [d.entity.id]));
- context.map().zoomToEase(d.entity);
- } else {
- context.zoomToEntity(d.id);
- }
- }
- function geocoderSearch() {
- services.geocoder.search(search.property("value"), function(err, resp) {
- _geocodeResults = resp || [];
- drawList();
+ // modules/ui/spinner.js
+ function uiSpinner(context) {
+ var osm = context.connection();
+ return function(selection2) {
+ var img = selection2.append("img").attr("src", context.imagePath("loader-black.gif")).style("opacity", 0);
+ if (osm) {
+ osm.on("loading.spinner", function() {
+ img.transition().style("opacity", 1);
+ }).on("loaded.spinner", function() {
+ img.transition().style("opacity", 0);
});
}
- }
- return featureList;
+ };
}
- // modules/ui/improveOSM_comments.js
- function uiImproveOsmComments() {
- let _qaItem;
- function issueComments(selection2) {
- let comments = selection2.selectAll(".comments-container").data([0]);
- comments = comments.enter().append("div").attr("class", "comments-container").merge(comments);
- services.improveOSM.getComments(_qaItem).then((d) => {
- if (!d.comments)
- return;
- const commentEnter = comments.selectAll(".comment").data(d.comments).enter().append("div").attr("class", "comment");
- commentEnter.append("div").attr("class", "comment-avatar").call(svgIcon("#iD-icon-avatar", "comment-avatar-icon"));
- const mainEnter = commentEnter.append("div").attr("class", "comment-main");
- const metadataEnter = mainEnter.append("div").attr("class", "comment-metadata");
- metadataEnter.append("div").attr("class", "comment-author").each(function(d2) {
- const osm = services.osm;
- let selection3 = select_default2(this);
- if (osm && d2.username) {
- selection3 = selection3.append("a").attr("class", "comment-author-link").attr("href", osm.userURL(d2.username)).attr("target", "_blank");
- }
- selection3.text((d4) => d4.username);
- });
- metadataEnter.append("div").attr("class", "comment-date").html((d2) => _t.html("note.status.commented", { when: localeDateString2(d2.timestamp) }));
- mainEnter.append("div").attr("class", "comment-text").append("p").text((d2) => d2.text);
- }).catch((err) => {
- console.log(err);
+ // modules/ui/sections/privacy.js
+ function uiSectionPrivacy(context) {
+ let section = uiSection("preferences-third-party", context).label(() => _t.append("preferences.privacy.title")).disclosureContent(renderDisclosureContent);
+ function renderDisclosureContent(selection2) {
+ selection2.selectAll(".privacy-options-list").data([0]).enter().append("ul").attr("class", "layer-list privacy-options-list");
+ let thirdPartyIconsEnter = selection2.select(".privacy-options-list").selectAll(".privacy-third-party-icons-item").data([corePreferences("preferences.privacy.thirdpartyicons") || "true"]).enter().append("li").attr("class", "privacy-third-party-icons-item").append("label").call(
+ uiTooltip().title(() => _t.append("preferences.privacy.third_party_icons.tooltip")).placement("bottom")
+ );
+ thirdPartyIconsEnter.append("input").attr("type", "checkbox").on("change", (d3_event, d2) => {
+ d3_event.preventDefault();
+ corePreferences("preferences.privacy.thirdpartyicons", d2 === "true" ? "false" : "true");
});
+ thirdPartyIconsEnter.append("span").call(_t.append("preferences.privacy.third_party_icons.description"));
+ selection2.selectAll(".privacy-third-party-icons-item").classed("active", (d2) => d2 === "true").select("input").property("checked", (d2) => d2 === "true");
+ selection2.selectAll(".privacy-link").data([0]).enter().append("div").attr("class", "privacy-link").append("a").attr("target", "_blank").call(svgIcon("#iD-icon-out-link", "inline")).attr("href", "https://github.com/openstreetmap/iD/blob/release/PRIVACY.md").append("span").call(_t.append("preferences.privacy.privacy_link"));
}
- function localeDateString2(s) {
- if (!s)
- return null;
- const options2 = { day: "numeric", month: "short", year: "numeric" };
- const d = new Date(s * 1e3);
- if (isNaN(d.getTime()))
- return null;
- return d.toLocaleDateString(_mainLocalizer.localeCode(), options2);
- }
- issueComments.issue = function(val) {
- if (!arguments.length)
- return _qaItem;
- _qaItem = val;
- return issueComments;
- };
- return issueComments;
+ corePreferences.onChange("preferences.privacy.thirdpartyicons", section.reRender);
+ return section;
}
- // modules/ui/improveOSM_details.js
- function uiImproveOsmDetails(context) {
- let _qaItem;
- function issueDetail(d) {
- if (d.desc)
- return d.desc;
- const issueKey = d.issueKey;
- d.replacements = d.replacements || {};
- d.replacements.default = { html: _t.html("inspector.unknown") };
- return _t.html(`QA.improveOSM.error_types.${issueKey}.description`, d.replacements);
- }
- function improveOsmDetails(selection2) {
- const details = selection2.selectAll(".error-details").data(_qaItem ? [_qaItem] : [], (d) => `${d.id}-${d.status || 0}`);
- details.exit().remove();
- const detailsEnter = details.enter().append("div").attr("class", "error-details qa-details-container");
- const descriptionEnter = detailsEnter.append("div").attr("class", "qa-details-subsection");
- descriptionEnter.append("h4").call(_t.append("QA.keepRight.detail_description"));
- descriptionEnter.append("div").attr("class", "qa-details-description-text").html(issueDetail);
- let relatedEntities = [];
- descriptionEnter.selectAll(".error_entity_link, .error_object_link").attr("href", "#").each(function() {
- const link2 = select_default2(this);
- const isObjectLink = link2.classed("error_object_link");
- const entityID = isObjectLink ? utilEntityRoot(_qaItem.objectType) + _qaItem.objectId : this.textContent;
- const entity = context.hasEntity(entityID);
- relatedEntities.push(entityID);
- link2.on("mouseenter", () => {
- utilHighlightEntities([entityID], true, context);
- }).on("mouseleave", () => {
- utilHighlightEntities([entityID], false, context);
- }).on("click", (d3_event) => {
- d3_event.preventDefault();
- utilHighlightEntities([entityID], false, context);
- const osmlayer = context.layers().layer("osm");
- if (!osmlayer.enabled()) {
- osmlayer.enabled(true);
- }
- context.map().centerZoom(_qaItem.loc, 20);
- if (entity) {
- context.enter(modeSelect(context, [entityID]));
+ // modules/ui/splash.js
+ function uiSplash(context) {
+ return (selection2) => {
+ if (context.history().hasRestorableChanges()) return;
+ let updateMessage = "";
+ const sawPrivacyVersion = corePreferences("sawPrivacyVersion");
+ let showSplash = !corePreferences("sawSplash");
+ if (sawPrivacyVersion !== context.privacyVersion) {
+ updateMessage = _t("splash.privacy_update");
+ showSplash = true;
+ }
+ if (!showSplash) return;
+ corePreferences("sawSplash", true);
+ corePreferences("sawPrivacyVersion", context.privacyVersion);
+ _mainFileFetcher.get("intro_graph");
+ let modalSelection = uiModal(selection2);
+ modalSelection.select(".modal").attr("class", "modal-splash modal");
+ let introModal = modalSelection.select(".content").append("div").attr("class", "fillL");
+ introModal.append("div").attr("class", "modal-section").append("h3").call(_t.append("splash.welcome"));
+ let modalSection = introModal.append("div").attr("class", "modal-section");
+ modalSection.append("p").html(_t.html("splash.text", {
+ version: context.version,
+ website: { html: '' + _t.html("splash.changelog") + "" },
+ github: { html: 'github.com' }
+ }));
+ modalSection.append("p").html(_t.html("splash.privacy", {
+ updateMessage,
+ privacyLink: { html: '' + _t("splash.privacy_policy") + "" }
+ }));
+ uiSectionPrivacy(context).label(() => _t.append("splash.privacy_settings")).render(modalSection);
+ let buttonWrap = introModal.append("div").attr("class", "modal-actions");
+ let walkthrough = buttonWrap.append("button").attr("class", "walkthrough").on("click", () => {
+ context.container().call(uiIntro(context));
+ modalSelection.close();
+ });
+ walkthrough.append("svg").attr("class", "logo logo-walkthrough").append("use").attr("xlink:href", "#iD-logo-walkthrough");
+ walkthrough.append("div").call(_t.append("splash.walkthrough"));
+ let startEditing = buttonWrap.append("button").attr("class", "start-editing").on("click", modalSelection.close);
+ startEditing.append("svg").attr("class", "logo logo-features").append("use").attr("xlink:href", "#iD-logo-features");
+ startEditing.append("div").call(_t.append("splash.start"));
+ modalSelection.select("button.close").attr("class", "hide");
+ };
+ }
+
+ // modules/ui/status.js
+ function uiStatus(context) {
+ var osm = context.connection();
+ return function(selection2) {
+ if (!osm) return;
+ function update(err, apiStatus) {
+ selection2.html("");
+ if (err) {
+ if (apiStatus === "connectionSwitched") {
+ return;
+ } else if (apiStatus === "rateLimited") {
+ selection2.call(_t.append("osm_api_status.message.rateLimit")).append("a").attr("href", "#").attr("class", "api-status-login").attr("target", "_blank").call(svgIcon("#iD-icon-out-link", "inline")).append("span").call(_t.append("login")).on("click.login", function(d3_event) {
+ d3_event.preventDefault();
+ osm.authenticate();
+ });
} else {
- context.loadEntity(entityID, (err, result) => {
- if (err)
- return;
- const entity2 = result.data.find((e) => e.id === entityID);
- if (entity2)
- context.enter(modeSelect(context, [entityID]));
+ var throttledRetry = throttle_default(function() {
+ context.loadTiles(context.projection);
+ osm.reloadApiStatus();
+ }, 2e3);
+ selection2.call(_t.append("osm_api_status.message.error", { suffix: " " })).append("a").attr("href", "#").call(_t.append("osm_api_status.retry")).on("click.retry", function(d3_event) {
+ d3_event.preventDefault();
+ throttledRetry();
});
}
- });
- if (entity) {
- let name2 = utilDisplayName(entity);
- if (!name2 && !isObjectLink) {
- const preset = _mainPresetIndex.match(entity, context.graph());
- name2 = preset && !preset.isFallback() && preset.name();
- }
- if (name2) {
- this.innerText = name2;
- }
+ } else if (apiStatus === "readonly") {
+ selection2.call(_t.append("osm_api_status.message.readonly"));
+ } else if (apiStatus === "offline") {
+ selection2.call(_t.append("osm_api_status.message.offline"));
}
+ selection2.attr("class", "api-status " + (err ? "error" : apiStatus));
+ }
+ osm.on("apiStatusChange.uiStatus", update);
+ context.history().on("storage_error", () => {
+ selection2.selectAll("span.local-storage-full").remove();
+ selection2.append("span").attr("class", "local-storage-full").call(_t.append("osm_api_status.message.local_storage_full"));
+ selection2.classed("error", true);
});
- context.features().forceVisible(relatedEntities);
- context.map().pan([0, 0]);
- }
- improveOsmDetails.issue = function(val) {
- if (!arguments.length)
- return _qaItem;
- _qaItem = val;
- return improveOsmDetails;
+ window.setInterval(function() {
+ osm.reloadApiStatus();
+ }, 9e4);
+ osm.reloadApiStatus();
};
- return improveOsmDetails;
}
- // modules/ui/improveOSM_header.js
- function uiImproveOsmHeader() {
- let _qaItem;
- function issueTitle(d) {
- const issueKey = d.issueKey;
- d.replacements = d.replacements || {};
- d.replacements.default = { html: _t.html("inspector.unknown") };
- return _t.html(`QA.improveOSM.error_types.${issueKey}.title`, d.replacements);
- }
- function improveOsmHeader(selection2) {
- const header = selection2.selectAll(".qa-header").data(_qaItem ? [_qaItem] : [], (d) => `${d.id}-${d.status || 0}`);
- header.exit().remove();
- const headerEnter = header.enter().append("div").attr("class", "qa-header");
- const svgEnter = headerEnter.append("div").attr("class", "qa-header-icon").classed("new", (d) => d.id < 0).append("svg").attr("width", "20px").attr("height", "30px").attr("viewbox", "0 0 20 30").attr("class", (d) => `preset-icon-28 qaItem ${d.service} itemId-${d.id} itemType-${d.itemType}`);
- svgEnter.append("polygon").attr("fill", "currentColor").attr("class", "qaItem-fill").attr("points", "16,3 4,3 1,6 1,17 4,20 7,20 10,27 13,20 16,20 19,17.033 19,6");
- svgEnter.append("use").attr("class", "icon-annotation").attr("width", "12px").attr("height", "12px").attr("transform", "translate(4, 5.5)").attr("xlink:href", (d) => d.icon ? "#" + d.icon : "");
- headerEnter.append("div").attr("class", "qa-header-label").html(issueTitle);
- }
- improveOsmHeader.issue = function(val) {
- if (!arguments.length)
- return _qaItem;
- _qaItem = val;
- return improveOsmHeader;
+ // modules/ui/tools/modes.js
+ function uiToolDrawModes(context) {
+ var tool = {
+ id: "old_modes",
+ label: _t.append("toolbar.add_feature")
};
- return improveOsmHeader;
- }
-
- // modules/ui/improveOSM_editor.js
- function uiImproveOsmEditor(context) {
- const dispatch10 = dispatch_default("change");
- const qaDetails = uiImproveOsmDetails(context);
- const qaComments = uiImproveOsmComments(context);
- const qaHeader = uiImproveOsmHeader(context);
- let _qaItem;
- function improveOsmEditor(selection2) {
- const headerEnter = selection2.selectAll(".header").data([0]).enter().append("div").attr("class", "header fillL");
- headerEnter.append("button").attr("class", "close").attr("title", _t("icons.close")).on("click", () => context.enter(modeBrowse(context))).call(svgIcon("#iD-icon-close"));
- headerEnter.append("h2").call(_t.append("QA.improveOSM.title"));
- let body = selection2.selectAll(".body").data([0]);
- body = body.enter().append("div").attr("class", "body").merge(body);
- const editor = body.selectAll(".qa-editor").data([0]);
- editor.enter().append("div").attr("class", "modal-section qa-editor").merge(editor).call(qaHeader.issue(_qaItem)).call(qaDetails.issue(_qaItem)).call(qaComments.issue(_qaItem)).call(improveOsmSaveSection);
+ 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();
}
- function improveOsmSaveSection(selection2) {
- const isSelected = _qaItem && _qaItem.id === context.selectedErrorID();
- const isShown = _qaItem && (isSelected || _qaItem.newComment || _qaItem.comment);
- let saveSection = selection2.selectAll(".qa-save").data(isShown ? [_qaItem] : [], (d) => `${d.id}-${d.status || 0}`);
- saveSection.exit().remove();
- const saveSectionEnter = saveSection.enter().append("div").attr("class", "qa-save save-section cf");
- saveSectionEnter.append("h4").attr("class", ".qa-save-header").call(_t.append("note.newComment"));
- saveSectionEnter.append("textarea").attr("class", "new-comment-input").attr("placeholder", _t("QA.keepRight.comment_placeholder")).attr("maxlength", 1e3).property("value", (d) => d.newComment).call(utilNoAuto).on("input", changeInput).on("blur", changeInput);
- saveSection = saveSectionEnter.merge(saveSection).call(qaSaveButtons);
- function changeInput() {
- const input = select_default2(this);
- let val = input.property("value").trim();
- if (val === "") {
- val = void 0;
- }
- _qaItem = _qaItem.update({ newComment: val });
- const qaService = services.improveOSM;
- if (qaService) {
- qaService.replaceItem(_qaItem);
- }
- saveSection.call(qaSaveButtons);
- }
+ function osmEditable() {
+ return context.editable();
}
- function qaSaveButtons(selection2) {
- const isSelected = _qaItem && _qaItem.id === context.selectedErrorID();
- let buttonSection = selection2.selectAll(".buttons").data(isSelected ? [_qaItem] : [], (d) => d.status + d.id);
- buttonSection.exit().remove();
- const buttonEnter = buttonSection.enter().append("div").attr("class", "buttons");
- buttonEnter.append("button").attr("class", "button comment-button action").call(_t.append("QA.keepRight.save_comment"));
- buttonEnter.append("button").attr("class", "button close-button action");
- buttonEnter.append("button").attr("class", "button ignore-button action");
- buttonSection = buttonSection.merge(buttonEnter);
- buttonSection.select(".comment-button").attr("disabled", (d) => d.newComment ? null : true).on("click.comment", function(d3_event, d) {
- this.blur();
- const qaService = services.improveOSM;
- if (qaService) {
- qaService.postUpdate(d, (err, item) => dispatch10.call("change", item));
- }
- });
- buttonSection.select(".close-button").html((d) => {
- const andComment = d.newComment ? "_comment" : "";
- return _t.html(`QA.keepRight.close${andComment}`);
- }).on("click.close", function(d3_event, d) {
- this.blur();
- const qaService = services.improveOSM;
- if (qaService) {
- d.newStatus = "SOLVED";
- qaService.postUpdate(d, (err, item) => dispatch10.call("change", item));
+ 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);
}
});
- buttonSection.select(".ignore-button").html((d) => {
- const andComment = d.newComment ? "_comment" : "";
- return _t.html(`QA.keepRight.ignore${andComment}`);
- }).on("click.ignore", function(d3_event, d) {
- this.blur();
- const qaService = services.improveOSM;
- if (qaService) {
- d.newStatus = "INVALID";
- qaService.postUpdate(d, (err, item) => dispatch10.call("change", item));
+ });
+ 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(d2) {
+ return d2.id;
+ });
+ buttons.exit().remove();
+ var buttonsEnter = buttons.enter().append("button").attr("class", function(d2) {
+ return d2.id + " add-button bar-button";
+ }).on("click.mode-buttons", function(d3_event, d2) {
+ if (!enabled(d2)) return;
+ var currMode = context.mode().id;
+ if (/^draw/.test(currMode)) return;
+ if (d2.id === currMode) {
+ context.enter(modeBrowse(context));
+ } else {
+ context.enter(d2);
+ }
+ }).call(
+ uiTooltip().placement("bottom").title(function(d2) {
+ return d2.description;
+ }).keys(function(d2) {
+ return [d2.key];
+ }).scrollContainer(context.container().select(".top-toolbar"))
+ );
+ buttonsEnter.each(function(d2) {
+ select_default2(this).call(svgIcon("#iD-icon-" + d2.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);
}
- });
- }
- improveOsmEditor.error = function(val) {
- if (!arguments.length)
- return _qaItem;
- _qaItem = val;
- return improveOsmEditor;
+ buttons = buttons.merge(buttonsEnter).attr("aria-disabled", function(d2) {
+ return !enabled(d2);
+ }).classed("disabled", function(d2) {
+ return !enabled(d2);
+ }).attr("aria-pressed", function(d2) {
+ return context.mode() && context.mode().button === d2.button;
+ }).classed("active", function(d2) {
+ return context.mode() && context.mode().button === d2.button;
+ });
+ }
};
- return utilRebind(improveOsmEditor, dispatch10, "on");
+ return tool;
}
- // modules/ui/preset_list.js
- function uiPresetList(context) {
- var dispatch10 = dispatch_default("cancel", "choose");
- var _entityIDs;
- var _currLoc;
- var _currentPresets;
- var _autofocus = false;
- function presetList(selection2) {
- if (!_entityIDs)
- return;
- var presets = _mainPresetIndex.matchAllGeometry(entityGeometries());
- selection2.html("");
- var messagewrap = selection2.append("div").attr("class", "header fillL");
- var message = messagewrap.append("h2").call(_t.append("inspector.choose"));
- var direction = _mainLocalizer.textDirection() === "rtl" ? "backward" : "forward";
- messagewrap.append("button").attr("class", "preset-choose").attr("title", direction).on("click", function() {
- dispatch10.call("cancel", this);
- }).call(svgIcon(`#iD-icon-${direction}`));
- function initialKeydown(d3_event) {
- if (search.property("value").length === 0 && (d3_event.keyCode === utilKeybinding.keyCodes["\u232B"] || d3_event.keyCode === utilKeybinding.keyCodes["\u2326"])) {
- d3_event.preventDefault();
- d3_event.stopPropagation();
- operationDelete(context, _entityIDs)();
- } else if (search.property("value").length === 0 && (d3_event.ctrlKey || d3_event.metaKey) && d3_event.keyCode === utilKeybinding.keyCodes.z) {
- d3_event.preventDefault();
- d3_event.stopPropagation();
- context.undo();
- } else if (!d3_event.ctrlKey && !d3_event.metaKey) {
- select_default2(this).on("keydown", keydown);
- keydown.call(this, d3_event);
- }
- }
- function keydown(d3_event) {
- if (d3_event.keyCode === utilKeybinding.keyCodes["\u2193"] && search.node().selectionStart === search.property("value").length) {
- d3_event.preventDefault();
- d3_event.stopPropagation();
- var buttons = list.selectAll(".preset-list-button");
- if (!buttons.empty())
- buttons.nodes()[0].focus();
- }
- }
- function keypress(d3_event) {
- var value = search.property("value");
- if (d3_event.keyCode === 13 && value.length) {
- list.selectAll(".preset-list-item:first-child").each(function(d) {
- d.choose.call(this);
- });
- }
+ // 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 notesEnabled() {
+ var noteLayer = context.layers().layer("notes");
+ return noteLayer && noteLayer.enabled();
+ }
+ function notesEditable() {
+ var mode2 = context.mode();
+ return context.map().notesEditable() && mode2 && mode2.id !== "save";
+ }
+ context.keybinding().on(mode.key, function() {
+ if (!enabled()) return;
+ if (mode.id === context.mode().id) {
+ context.enter(modeBrowse(context));
+ } else {
+ context.enter(mode);
}
- function inputevent() {
- var value = search.property("value");
- list.classed("filtered", value.length);
- var results, messageText;
- if (value.length) {
- results = presets.search(value, entityGeometries()[0], _currLoc);
- messageText = _t.html("inspector.results", {
- n: results.collection.length,
- search: value
- });
- } else {
- results = _mainPresetIndex.defaults(entityGeometries()[0], 36, !context.inIntro(), _currLoc);
- messageText = _t.html("inspector.choose");
+ });
+ 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(d2) {
+ return d2.id;
+ });
+ buttons.exit().remove();
+ var buttonsEnter = buttons.enter().append("button").attr("class", function(d2) {
+ return d2.id + " add-button bar-button";
+ }).on("click.notes", function(d3_event, d2) {
+ if (!enabled()) return;
+ var currMode = context.mode().id;
+ if (/^draw/.test(currMode)) return;
+ if (d2.id === currMode) {
+ context.enter(modeBrowse(context));
+ } else {
+ context.enter(d2);
+ }
+ }).call(
+ uiTooltip().placement("bottom").title(function(d2) {
+ return d2.description;
+ }).keys(function(d2) {
+ return [d2.key];
+ }).scrollContainer(context.container().select(".top-toolbar"))
+ );
+ buttonsEnter.each(function(d2) {
+ select_default2(this).call(svgIcon(d2.icon || "#iD-icon-" + d2.button));
+ });
+ if (buttons.enter().size() || buttons.exit().size()) {
+ context.ui().checkOverflow(".top-toolbar", true);
}
- list.call(drawList, results);
- message.html(messageText);
- }
- var searchWrap = selection2.append("div").attr("class", "search-header");
- searchWrap.call(svgIcon("#iD-icon-search", "pre-text"));
- var search = searchWrap.append("input").attr("class", "preset-search-input").attr("placeholder", _t("inspector.search")).attr("type", "search").call(utilNoAuto).on("keydown", initialKeydown).on("keypress", keypress).on("input", debounce_default(inputevent));
- if (_autofocus) {
- search.node().focus();
- setTimeout(function() {
- search.node().focus();
- }, 0);
+ buttons = buttons.merge(buttonsEnter).classed("disabled", function() {
+ return !enabled();
+ }).attr("aria-disabled", function() {
+ return !enabled();
+ }).classed("active", function(d2) {
+ return context.mode() && context.mode().button === d2.button;
+ }).attr("aria-pressed", function(d2) {
+ return context.mode() && context.mode().button === d2.button;
+ });
}
- var listWrap = selection2.append("div").attr("class", "inspector-body");
- var list = listWrap.append("div").attr("class", "preset-list").call(drawList, _mainPresetIndex.defaults(entityGeometries()[0], 36, !context.inIntro(), _currLoc));
- context.features().on("change.preset-list", updateForFeatureHiddenState);
+ };
+ 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;
+ }
+
+ // 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";
}
- function drawList(list, presets) {
- presets = presets.matchAllGeometry(entityGeometries());
- var collection = presets.collection.reduce(function(collection2, preset) {
- if (!preset)
- return collection2;
- if (preset.members) {
- if (preset.members.collection.filter(function(preset2) {
- return preset2.addable();
- }).length > 1) {
- collection2.push(CategoryItem(preset));
- }
- } else if (preset.addable()) {
- collection2.push(PresetItem(preset));
- }
- return collection2;
- }, []);
- var items = list.selectAll(".preset-list-item").data(collection, function(d) {
- return d.preset.id;
- });
- items.order();
- items.exit().remove();
- items.enter().append("div").attr("class", function(item) {
- return "preset-list-item preset-" + item.preset.id.replace("/", "-");
- }).classed("current", function(item) {
- return _currentPresets.indexOf(item.preset) !== -1;
- }).each(function(item) {
- select_default2(this).call(item);
- }).style("opacity", 0).transition().style("opacity", 1);
- updateForFeatureHiddenState();
+ function isDisabled() {
+ return _numChanges === 0 || isSaving();
}
- function itemKeydown(d3_event) {
- var item = select_default2(this.closest(".preset-list-item"));
- var parentItem = select_default2(item.node().parentNode.closest(".preset-list-item"));
- if (d3_event.keyCode === utilKeybinding.keyCodes["\u2193"]) {
- d3_event.preventDefault();
- d3_event.stopPropagation();
- var nextItem = select_default2(item.node().nextElementSibling);
- if (nextItem.empty()) {
- if (!parentItem.empty()) {
- nextItem = select_default2(parentItem.node().nextElementSibling);
- }
- } else if (select_default2(this).classed("expanded")) {
- nextItem = item.select(".subgrid .preset-list-item:first-child");
- }
- if (!nextItem.empty()) {
- nextItem.select(".preset-list-button").node().focus();
- }
- } else if (d3_event.keyCode === utilKeybinding.keyCodes["\u2191"]) {
- d3_event.preventDefault();
- d3_event.stopPropagation();
- var previousItem = select_default2(item.node().previousElementSibling);
- if (previousItem.empty()) {
- if (!parentItem.empty()) {
- previousItem = parentItem;
- }
- } else if (previousItem.select(".preset-list-button").classed("expanded")) {
- previousItem = previousItem.select(".subgrid .preset-list-item:last-child");
- }
- if (!previousItem.empty()) {
- previousItem.select(".preset-list-button").node().focus();
- } else {
- var search = select_default2(this.closest(".preset-list-pane")).select(".preset-search-input");
- search.node().focus();
- }
- } else if (d3_event.keyCode === utilKeybinding.keyCodes[_mainLocalizer.textDirection() === "rtl" ? "\u2192" : "\u2190"]) {
- d3_event.preventDefault();
- d3_event.stopPropagation();
- if (!parentItem.empty()) {
- parentItem.select(".preset-list-button").node().focus();
- }
- } else if (d3_event.keyCode === utilKeybinding.keyCodes[_mainLocalizer.textDirection() === "rtl" ? "\u2190" : "\u2192"]) {
- d3_event.preventDefault();
- d3_event.stopPropagation();
- item.datum().choose.call(select_default2(this).node());
+ function save(d3_event) {
+ d3_event.preventDefault();
+ if (!context.inIntro() && !isSaving() && history.hasChanges()) {
+ context.enter(modeSave(context));
}
}
- function CategoryItem(preset) {
- var box, sublist, shown = false;
- function item(selection2) {
- var wrap2 = selection2.append("div").attr("class", "preset-list-button-wrap category");
- function click() {
- var isExpanded = select_default2(this).classed("expanded");
- var iconName = isExpanded ? _mainLocalizer.textDirection() === "rtl" ? "#iD-icon-backward" : "#iD-icon-forward" : "#iD-icon-down";
- select_default2(this).classed("expanded", !isExpanded).attr("title", !isExpanded ? _t("icons.collapse") : _t("icons.expand"));
- select_default2(this).selectAll("div.label-inner svg.icon use").attr("href", iconName);
- item.choose();
- }
- var geometries = entityGeometries();
- var button = wrap2.append("button").attr("class", "preset-list-button").attr("title", _t("icons.expand")).classed("expanded", false).call(uiPresetIcon().geometry(geometries.length === 1 && geometries[0]).preset(preset)).on("click", click).on("keydown", function(d3_event) {
- if (d3_event.keyCode === utilKeybinding.keyCodes[_mainLocalizer.textDirection() === "rtl" ? "\u2190" : "\u2192"]) {
- d3_event.preventDefault();
- d3_event.stopPropagation();
- if (!select_default2(this).classed("expanded")) {
- click.call(this, d3_event);
- }
- } else if (d3_event.keyCode === utilKeybinding.keyCodes[_mainLocalizer.textDirection() === "rtl" ? "\u2192" : "\u2190"]) {
- d3_event.preventDefault();
- d3_event.stopPropagation();
- if (select_default2(this).classed("expanded")) {
- click.call(this, d3_event);
- }
- } else {
- itemKeydown.call(this, d3_event);
- }
- });
- var label = button.append("div").attr("class", "label").append("div").attr("class", "label-inner");
- label.append("div").attr("class", "namepart").call(svgIcon(_mainLocalizer.textDirection() === "rtl" ? "#iD-icon-backward" : "#iD-icon-forward", "inline")).append("span").html(function() {
- return preset.nameLabel() + "…";
- });
- box = selection2.append("div").attr("class", "subgrid").style("max-height", "0px").style("opacity", 0);
- box.append("div").attr("class", "arrow");
- sublist = box.append("div").attr("class", "preset-list fillL3");
+ 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);
}
- item.choose = function() {
- if (!box || !sublist)
- return;
- if (shown) {
- shown = false;
- box.transition().duration(200).style("opacity", "0").style("max-height", "0px").style("padding-bottom", "0px");
- } else {
- shown = true;
- var members = preset.members.matchAllGeometry(entityGeometries());
- sublist.call(drawList, members);
- box.transition().duration(200).style("opacity", "1").style("max-height", 200 + members.collection.length * 190 + "px").style("padding-bottom", "10px");
- }
- };
- item.preset = preset;
- return item;
}
- function PresetItem(preset) {
- function item(selection2) {
- var wrap2 = selection2.append("div").attr("class", "preset-list-button-wrap");
- var geometries = entityGeometries();
- var button = wrap2.append("button").attr("class", "preset-list-button").call(uiPresetIcon().geometry(geometries.length === 1 && geometries[0]).preset(preset)).on("click", item.choose).on("keydown", itemKeydown);
- var label = button.append("div").attr("class", "label").append("div").attr("class", "label-inner");
- var nameparts = [
- preset.nameLabel(),
- preset.subtitleLabel()
- ].filter(Boolean);
- label.selectAll(".namepart").data(nameparts).enter().append("div").attr("class", "namepart").html(function(d) {
- return d;
- });
- wrap2.call(item.reference.button);
- selection2.call(item.reference.body);
+ 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]);
}
- item.choose = function() {
- if (select_default2(this).classed("disabled"))
- return;
- if (!context.inIntro()) {
- _mainPresetIndex.setMostRecent(preset, entityGeometries()[0]);
+ if (button) {
+ button.classed("disabled", isDisabled()).style("background", bgColor(_numChanges));
+ button.select("span.count").text(_numChanges);
+ }
+ }
+ 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"))();
}
- context.perform(function(graph) {
- for (var i2 in _entityIDs) {
- var entityID = _entityIDs[i2];
- var oldPreset = _mainPresetIndex.match(graph.entity(entityID), graph);
- graph = actionChangePreset(entityID, oldPreset, preset)(graph);
+ 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);
}
- return graph;
- }, _t("operations.change_tags.annotation"));
- context.validator().validate();
- dispatch10.call("choose", this, preset);
- };
- item.help = function(d3_event) {
- d3_event.stopPropagation();
- item.reference.toggle();
- };
- item.preset = preset;
- item.reference = uiTagReference(preset.reference(), context);
- return item;
+ }
+ });
+ };
+ 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;
+ }
+
+ // 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/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
+ /* ignore min zoom */
+ );
}
- function updateForFeatureHiddenState() {
- if (!_entityIDs.every(context.hasEntity))
- return;
- var geometries = entityGeometries();
- var button = context.container().selectAll(".preset-list .preset-list-button");
- button.call(uiTooltip().destroyAny);
- button.each(function(item, index) {
- var hiddenPresetFeaturesId;
- for (var i2 in geometries) {
- hiddenPresetFeaturesId = context.features().isHiddenPreset(item.preset, geometries[i2]);
- if (hiddenPresetFeaturesId)
- break;
+ tool.render = function(selection2) {
+ var tooltipBehavior = uiTooltip().placement("bottom").title(function(d2) {
+ return d2.annotation() ? _t.append(d2.id + ".tooltip", { action: d2.annotation() }) : _t.append(d2.id + ".nothing");
+ }).keys(function(d2) {
+ return [d2.cmd];
+ }).scrollContainer(context.container().select(".top-toolbar"));
+ var lastPointerUpType;
+ var buttons = selection2.selectAll("button").data(commands).enter().append("button").attr("class", function(d2) {
+ return "disabled " + d2.id + "-button bar-button";
+ }).on("pointerup", function(d3_event) {
+ lastPointerUpType = d3_event.pointerType;
+ }).on("click", function(d3_event, d2) {
+ d3_event.preventDefault();
+ var annotation = d2.annotation();
+ if (editable() && annotation) {
+ d2.action();
}
- var isHiddenPreset = !context.inIntro() && !!hiddenPresetFeaturesId && (_currentPresets.length !== 1 || item.preset !== _currentPresets[0]);
- select_default2(this).classed("disabled", isHiddenPreset);
- if (isHiddenPreset) {
- var isAutoHidden = context.features().autoHidden(hiddenPresetFeaturesId);
- select_default2(this).call(uiTooltip().title(_t.html("inspector.hidden_preset." + (isAutoHidden ? "zoom" : "manual"), {
- features: { html: _t.html("feature." + hiddenPresetFeaturesId + ".description") }
- })).placement(index < 2 ? "bottom" : "top"));
+ if (editable() && (lastPointerUpType === "touch" || lastPointerUpType === "pen")) {
+ var label = annotation ? _t.append(d2.id + ".tooltip", { action: annotation }) : _t.append(d2.id + ".nothing");
+ context.ui().flash.duration(2e3).iconName("#" + d2.icon).iconClass(annotation ? "" : "disabled").label(label)();
}
+ lastPointerUpType = null;
+ }).call(tooltipBehavior);
+ buttons.each(function(d2) {
+ select_default2(this).call(svgIcon("#" + d2.icon));
});
- }
- presetList.autofocus = function(val) {
- if (!arguments.length)
- return _autofocus;
- _autofocus = val;
- return presetList;
- };
- presetList.entityIDs = function(val) {
- if (!arguments.length)
- return _entityIDs;
- _entityIDs = val;
- _currLoc = null;
- if (_entityIDs && _entityIDs.length) {
- const extent = _entityIDs.reduce(function(extent2, entityID) {
- var entity = context.graph().entity(entityID);
- return extent2.extend(entity.extent(context.graph()));
- }, geoExtent());
- _currLoc = extent.center();
- var presets = _entityIDs.map(function(entityID) {
- return _mainPresetIndex.match(context.entity(entityID), context.graph());
+ 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 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(difference2) {
+ if (difference2) update();
+ });
+ context.on("enter.undo_redo", update);
+ function update() {
+ buttons.classed("disabled", function(d2) {
+ return !editable() || !d2.annotation();
+ }).each(function() {
+ var selection3 = select_default2(this);
+ if (!selection3.select(".tooltip.in").empty()) {
+ selection3.call(tooltipBehavior.updateContent);
+ }
});
- presetList.presets(presets);
}
- return presetList;
};
- presetList.presets = function(val) {
- if (!arguments.length)
- return _currentPresets;
- _currentPresets = val;
- return presetList;
+ 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);
};
- function entityGeometries() {
- var counts = {};
- for (var i2 in _entityIDs) {
- var entityID = _entityIDs[i2];
- var entity = context.entity(entityID);
- var geometry = entity.geometry(context.graph());
- if (geometry === "vertex" && entity.isOnAddressLine(context.graph())) {
- geometry = "point";
+ 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;
}
- if (!counts[geometry])
- counts[geometry] = 0;
- counts[geometry] += 1;
- }
- return Object.keys(counts).sort(function(geom1, geom2) {
- return counts[geom2] - counts[geom1];
});
+ 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(d2) {
+ return d2.id || d2;
+ });
+ toolbarItems.exit().each(function(d2) {
+ if (d2.uninstall) {
+ d2.uninstall();
+ }
+ }).remove();
+ var itemsEnter = toolbarItems.enter().append("div").attr("class", function(d2) {
+ var classes = "toolbar-item " + (d2.id || d2).replace("_", "-");
+ if (d2.klass) classes += " " + d2.klass;
+ return classes;
+ });
+ var actionableItems = itemsEnter.filter(function(d2) {
+ return d2 !== "spacer";
+ });
+ actionableItems.append("div").attr("class", "item-content").each(function(d2) {
+ select_default2(this).call(d2.render, bar);
+ });
+ actionableItems.append("div").attr("class", "item-label").each(function(d2) {
+ d2.label(select_default2(this));
+ });
+ }
}
- return utilRebind(presetList, dispatch10, "on");
+ return topToolbar;
}
- // modules/ui/view_on_osm.js
- function uiViewOnOSM(context) {
- var _what;
- function viewOnOSM(selection2) {
- var url;
- if (_what instanceof osmEntity) {
- url = context.connection().entityURL(_what);
- } else if (_what instanceof osmNote) {
- url = context.connection().noteURL(_what);
+ // modules/ui/version.js
+ var sawVersion = null;
+ var isNewVersion = false;
+ var isNewUser = false;
+ function uiVersion(context) {
+ var currVersion = context.version;
+ var matchedVersion = currVersion.match(/\d+\.\d+\.\d+.*/);
+ if (sawVersion === null && matchedVersion !== null) {
+ if (corePreferences("sawVersion")) {
+ isNewUser = false;
+ isNewVersion = corePreferences("sawVersion") !== currVersion && currVersion.indexOf("-") === -1;
+ } else {
+ isNewUser = true;
+ isNewVersion = true;
}
- var data = !_what || _what.isNew() ? [] : [_what];
- var link2 = selection2.selectAll(".view-on-osm").data(data, function(d) {
- return d.id;
- });
- link2.exit().remove();
- var linkEnter = link2.enter().append("a").attr("class", "view-on-osm").attr("target", "_blank").attr("href", url).call(svgIcon("#iD-icon-out-link", "inline"));
- linkEnter.append("span").call(_t.append("inspector.view_on_osm"));
+ corePreferences("sawVersion", currVersion);
+ sawVersion = currVersion;
}
- viewOnOSM.what = function(_) {
- if (!arguments.length)
- return _what;
- _what = _;
- return viewOnOSM;
+ return function(selection2) {
+ selection2.append("a").attr("target", "_blank").attr("href", "https://github.com/openstreetmap/iD").text(currVersion);
+ if (isNewVersion && !isNewUser) {
+ selection2.append("a").attr("class", "badge").attr("target", "_blank").attr("href", "https://github.com/openstreetmap/iD/blob/release/CHANGELOG.md#whats-new").call(svgIcon("#maki-gift")).call(
+ uiTooltip().title(() => _t.append("version.whats_new", { version: currVersion })).placement("top").scrollContainer(context.container().select(".main-footer-wrap"))
+ );
+ }
};
- return viewOnOSM;
}
- // modules/ui/inspector.js
- function uiInspector(context) {
- var presetList = uiPresetList(context);
- var entityEditor = uiEntityEditor(context);
- var wrap2 = select_default2(null), presetPane = select_default2(null), editorPane = select_default2(null);
- var _state = "select";
- var _entityIDs;
- var _newFeature = false;
- function inspector(selection2) {
- presetList.entityIDs(_entityIDs).autofocus(_newFeature).on("choose", inspector.setPreset).on("cancel", function() {
- inspector.setPreset();
+ // modules/ui/zoom.js
+ function uiZoom(context) {
+ var zooms = [{
+ id: "zoom-in",
+ icon: "iD-icon-plus",
+ title: _t.append("zoom.in"),
+ action: zoomIn,
+ disabled: function() {
+ return !context.map().canZoomIn();
+ },
+ disabledTitle: _t.append("zoom.disabled.in"),
+ key: "+"
+ }, {
+ id: "zoom-out",
+ icon: "iD-icon-minus",
+ title: _t.append("zoom.out"),
+ action: zoomOut,
+ disabled: function() {
+ return !context.map().canZoomOut();
+ },
+ disabledTitle: _t.append("zoom.disabled.out"),
+ key: "-"
+ }];
+ function zoomIn(d3_event) {
+ if (d3_event.shiftKey) return;
+ d3_event.preventDefault();
+ context.map().zoomIn();
+ }
+ function zoomOut(d3_event) {
+ if (d3_event.shiftKey) return;
+ d3_event.preventDefault();
+ context.map().zoomOut();
+ }
+ function zoomInFurther(d3_event) {
+ if (d3_event.shiftKey) return;
+ d3_event.preventDefault();
+ context.map().zoomInFurther();
+ }
+ function zoomOutFurther(d3_event) {
+ if (d3_event.shiftKey) return;
+ d3_event.preventDefault();
+ context.map().zoomOutFurther();
+ }
+ return function(selection2) {
+ var tooltipBehavior = uiTooltip().placement(_mainLocalizer.textDirection() === "rtl" ? "right" : "left").title(function(d2) {
+ if (d2.disabled()) {
+ return d2.disabledTitle;
+ }
+ return d2.title;
+ }).keys(function(d2) {
+ return [d2.key];
});
- entityEditor.state(_state).entityIDs(_entityIDs).on("choose", inspector.showList);
- wrap2 = selection2.selectAll(".panewrap").data([0]);
- var enter = wrap2.enter().append("div").attr("class", "panewrap");
- enter.append("div").attr("class", "preset-list-pane pane");
- enter.append("div").attr("class", "entity-editor-pane pane");
- wrap2 = wrap2.merge(enter);
- presetPane = wrap2.selectAll(".preset-list-pane");
- editorPane = wrap2.selectAll(".entity-editor-pane");
- function shouldDefaultToPresetList() {
- if (_state !== "select")
- return false;
- if (_entityIDs.length !== 1)
- return false;
- var entityID = _entityIDs[0];
- var entity = context.hasEntity(entityID);
- if (!entity)
- return false;
- if (entity.hasNonGeometryTags())
- return false;
- if (_newFeature)
- return true;
- if (entity.geometry(context.graph()) !== "vertex")
- return false;
- if (context.graph().parentRelations(entity).length)
- return false;
- if (context.validator().getEntityIssues(entityID).length)
- return false;
- if (entity.isHighwayIntersection(context.graph()))
- return false;
- return true;
+ var lastPointerUpType;
+ var buttons = selection2.selectAll("button").data(zooms).enter().append("button").attr("class", function(d2) {
+ return d2.id;
+ }).on("pointerup.editor", function(d3_event) {
+ lastPointerUpType = d3_event.pointerType;
+ }).on("click.editor", function(d3_event, d2) {
+ if (!d2.disabled()) {
+ d2.action(d3_event);
+ } else if (lastPointerUpType === "touch" || lastPointerUpType === "pen") {
+ context.ui().flash.duration(2e3).iconName("#" + d2.icon).iconClass("disabled").label(d2.disabledTitle)();
+ }
+ lastPointerUpType = null;
+ }).call(tooltipBehavior);
+ buttons.each(function(d2) {
+ select_default2(this).call(svgIcon("#" + d2.icon, "light"));
+ });
+ utilKeybinding.plusKeys.forEach(function(key) {
+ context.keybinding().on([key], zoomIn);
+ context.keybinding().on([uiCmd("\u2325" + key)], zoomInFurther);
+ });
+ utilKeybinding.minusKeys.forEach(function(key) {
+ context.keybinding().on([key], zoomOut);
+ context.keybinding().on([uiCmd("\u2325" + key)], zoomOutFurther);
+ });
+ function updateButtonStates() {
+ buttons.classed("disabled", function(d2) {
+ return d2.disabled();
+ }).each(function() {
+ var selection3 = select_default2(this);
+ if (!selection3.select(".tooltip.in").empty()) {
+ selection3.call(tooltipBehavior.updateContent);
+ }
+ });
}
- if (shouldDefaultToPresetList()) {
- wrap2.style("right", "-100%");
- editorPane.classed("hide", true);
- presetPane.classed("hide", false).call(presetList);
+ updateButtonStates();
+ context.map().on("move.uiZoom", updateButtonStates);
+ };
+ }
+
+ // 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 {
- wrap2.style("right", "0%");
- presetPane.classed("hide", true);
- editorPane.classed("hide", false).call(entityEditor);
+ var mode = context.mode();
+ if (mode && mode.zoomToSelected) {
+ mode.zoomToSelected();
+ }
}
- var footer = selection2.selectAll(".footer").data([0]);
- footer = footer.enter().append("div").attr("class", "footer").merge(footer);
- footer.call(uiViewOnOSM(context).what(context.hasEntity(_entityIDs.length === 1 && _entityIDs[0])));
+ _lastPointerUpType = null;
}
- inspector.showList = function(presets) {
- presetPane.classed("hide", false);
- wrap2.transition().styleTween("right", function() {
- return value_default("0%", "-100%");
- }).on("end", function() {
- editorPane.classed("hide", true);
- });
- if (presets) {
- presetList.presets(presets);
+ 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);
+ }
}
- presetPane.call(presetList.autofocus(true));
+ context.on("enter.uiZoomToSelection", setEnabledState);
+ setEnabledState();
};
- inspector.setPreset = function(preset) {
- if (preset && preset.id === "type/multipolygon") {
- presetPane.call(presetList.autofocus(true));
- } else {
- editorPane.classed("hide", false);
- wrap2.transition().styleTween("right", function() {
- return value_default("-100%", "0%");
- }).on("end", function() {
- presetPane.classed("hide", true);
- });
- if (preset) {
- entityEditor.presets([preset]);
- }
- editorPane.call(entityEditor);
+ }
+
+ // 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);
};
- inspector.state = function(val) {
- if (!arguments.length)
- return _state;
- _state = val;
- entityEditor.state(_state);
- context.container().selectAll(".field-help-body").remove();
- return inspector;
+ pane.renderContent = function(selection2) {
+ if (_sections) {
+ _sections.forEach(function(section) {
+ selection2.call(section.render);
+ });
+ }
};
- inspector.entityIDs = function(val) {
- if (!arguments.length)
- return _entityIDs;
- _entityIDs = val;
- return inspector;
+ pane.renderPane = function(selection2) {
+ _paneSelection = selection2.append("div").attr("class", "fillL map-pane hide " + id2 + "-pane").attr("pane", id2);
+ var heading2 = _paneSelection.append("div").attr("class", "pane-heading");
+ heading2.append("h2").text("").call(_label);
+ heading2.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);
+ }
};
- inspector.newFeature = function(val) {
- if (!arguments.length)
- return _newFeature;
- _newFeature = val;
- return inspector;
+ 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
};
- return inspector;
+ function clamp3(x2, min3, max3) {
+ return Math.max(min3, Math.min(x2, max3));
+ }
+ function updateValue(d2, val) {
+ val = clamp3(val, _minVal, _maxVal);
+ _options[d2] = val;
+ context.background()[d2](val);
+ if (d2 === "brightness") {
+ corePreferences("background-opacity", val);
+ }
+ 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(d2) {
+ return "display-control display-control-" + d2;
+ });
+ slidersEnter.html(function(d2) {
+ return _t.html("background." + d2);
+ }).append("span").attr("class", function(d2) {
+ return "display-option-value display-option-value-" + d2;
+ });
+ var sildersControlEnter = slidersEnter.append("div").attr("class", "control-wrap");
+ sildersControlEnter.append("input").attr("class", function(d2) {
+ return "display-option-input display-option-input-" + d2;
+ }).attr("type", "range").attr("min", _minVal).attr("max", _maxVal).attr("step", "0.05").on("input", function(d3_event, d2) {
+ var val = select_default2(this).property("value");
+ if (!val && d3_event && d3_event.target) {
+ val = d3_event.target.value;
+ }
+ updateValue(d2, val);
+ });
+ sildersControlEnter.append("button").attr("title", function(d2) {
+ return "".concat(_t("background.reset"), " ").concat(_t("background." + d2));
+ }).attr("class", function(d2) {
+ return "display-option-reset display-option-reset-" + d2;
+ }).on("click", function(d3_event, d2) {
+ if (d3_event.button !== 0) return;
+ updateValue(d2, 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 i3 = 0; i3 < _sliders.length; i3++) {
+ updateValue(_sliders[i3], 1);
+ }
+ });
+ container = containerEnter.merge(container);
+ container.selectAll(".display-option-input").property("value", function(d2) {
+ return _options[d2];
+ });
+ container.selectAll(".display-option-value").text(function(d2) {
+ return Math.floor(_options[d2] * 100) + "%";
+ });
+ container.selectAll(".display-option-reset").classed("disabled", function(d2) {
+ return _options[d2] === 1;
+ });
+ if (containerEnter.size() && _options.brightness !== 1) {
+ context.background().brightness(_options.brightness);
+ }
+ }
+ return section;
}
- // modules/ui/keepRight_details.js
- function uiKeepRightDetails(context) {
- let _qaItem;
- function issueDetail(d) {
- const { itemType, parentIssueType } = d;
- const unknown = { html: _t.html("inspector.unknown") };
- let replacements = d.replacements || {};
- replacements.default = unknown;
- if (_mainLocalizer.hasTextForStringId(`QA.keepRight.errorTypes.${itemType}.title`)) {
- return _t.html(`QA.keepRight.errorTypes.${itemType}.description`, replacements);
- } else {
- return _t.html(`QA.keepRight.errorTypes.${parentIssueType}.description`, replacements);
+ // modules/ui/settings/custom_background.js
+ function uiSettingsCustomBackground() {
+ var dispatch14 = dispatch_default("change");
+ function render(selection2) {
+ var _origSettings = {
+ template: corePreferences("background-custom-template")
+ };
+ var _currSettings = {
+ template: corePreferences("background-custom-template")
+ };
+ var example = "https://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 = "".concat(_t.html("settings.custom_background.instructions.info"), "\n") + "\n" + "#### ".concat(_t.html("settings.custom_background.instructions.wms.tokens_label"), "\n") + "* ".concat(_t.html("settings.custom_background.instructions.wms.tokens.proj"), "\n") + "* ".concat(_t.html("settings.custom_background.instructions.wms.tokens.wkid"), "\n") + "* ".concat(_t.html("settings.custom_background.instructions.wms.tokens.dimensions"), "\n") + "* ".concat(_t.html("settings.custom_background.instructions.wms.tokens.bbox"), "\n") + "\n" + "#### ".concat(_t.html("settings.custom_background.instructions.tms.tokens_label"), "\n") + "* ".concat(_t.html("settings.custom_background.instructions.tms.tokens.xyz"), "\n") + "* ".concat(_t.html("settings.custom_background.instructions.tms.tokens.flipped_y"), "\n") + "* ".concat(_t.html("settings.custom_background.instructions.tms.tokens.switch"), "\n") + "* ".concat(_t.html("settings.custom_background.instructions.tms.tokens.quadtile"), "\n") + "* ".concat(_t.html("settings.custom_background.instructions.tms.tokens.scale_factor"), "\n") + "\n" + "#### ".concat(_t.html("settings.custom_background.instructions.example"), "\n") + "`".concat(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 clickSave() {
+ _currSettings.template = textSection.select(".field-template").property("value");
+ corePreferences("background-custom-template", _currSettings.template);
+ this.blur();
+ modal.close();
+ dispatch14.call("change", this, _currSettings);
}
}
- function keepRightDetails(selection2) {
- const details = selection2.selectAll(".error-details").data(_qaItem ? [_qaItem] : [], (d) => `${d.id}-${d.status || 0}`);
- details.exit().remove();
- const detailsEnter = details.enter().append("div").attr("class", "error-details qa-details-container");
- const descriptionEnter = detailsEnter.append("div").attr("class", "qa-details-subsection");
- descriptionEnter.append("h4").call(_t.append("QA.keepRight.detail_description"));
- descriptionEnter.append("div").attr("class", "qa-details-description-text").html(issueDetail);
- let relatedEntities = [];
- descriptionEnter.selectAll(".error_entity_link, .error_object_link").attr("href", "#").each(function() {
- const link2 = select_default2(this);
- const isObjectLink = link2.classed("error_object_link");
- const entityID = isObjectLink ? utilEntityRoot(_qaItem.objectType) + _qaItem.objectId : this.textContent;
- const entity = context.hasEntity(entityID);
- relatedEntities.push(entityID);
- link2.on("mouseenter", () => {
- utilHighlightEntities([entityID], true, context);
- }).on("mouseleave", () => {
- utilHighlightEntities([entityID], false, context);
- }).on("click", (d3_event) => {
- d3_event.preventDefault();
- utilHighlightEntities([entityID], false, context);
- const osmlayer = context.layers().layer("osm");
- if (!osmlayer.enabled()) {
- osmlayer.enabled(true);
- }
- context.map().centerZoomEase(_qaItem.loc, 20);
- if (entity) {
- context.enter(modeSelect(context, [entityID]));
- } else {
- context.loadEntity(entityID, (err, result) => {
- if (err)
- return;
- const entity2 = result.data.find((e) => e.id === entityID);
- if (entity2)
- context.enter(modeSelect(context, [entityID]));
- });
- }
- });
- if (entity) {
- let name2 = utilDisplayName(entity);
- if (!name2 && !isObjectLink) {
- const preset = _mainPresetIndex.match(entity, context.graph());
- name2 = preset && !preset.isFallback() && preset.name();
- }
- if (name2) {
- this.innerText = name2;
- }
+ return utilRebind(render, dispatch14, "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 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, d2) {
+ chooseBackground(d2);
+ }, function(d2) {
+ return !d2.isHidden() && !d2.overlay;
+ });
+ }
+ function setTooltips(selection2) {
+ selection2.each(function(d2, i3, nodes) {
+ var item = select_default2(this).select("label");
+ var span = item.select("span");
+ var placement = i3 < nodes.length / 2 ? "bottom" : "top";
+ var hasDescription = d2.hasDescription();
+ var isOverflowing = span.property("clientWidth") !== span.property("scrollWidth");
+ item.call(uiTooltip().destroyAny);
+ if (d2.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 ? d2.description() : d2.label())
+ );
}
});
- context.features().forceVisible(relatedEntities);
- context.map().pan([0, 0]);
}
- keepRightDetails.issue = function(val) {
- if (!arguments.length)
- return _qaItem;
- _qaItem = val;
- return keepRightDetails;
- };
- return keepRightDetails;
- }
-
- // modules/ui/keepRight_header.js
- function uiKeepRightHeader() {
- let _qaItem;
- function issueTitle(d) {
- const { itemType, parentIssueType } = d;
- const unknown = _t.html("inspector.unknown");
- let replacements = d.replacements || {};
- replacements.default = { html: unknown };
- if (_mainLocalizer.hasTextForStringId(`QA.keepRight.errorTypes.${itemType}.title`)) {
- return _t.html(`QA.keepRight.errorTypes.${itemType}.title`, replacements);
+ function drawListItems(layerList, type2, change, filter2) {
+ var sources = context.background().sources(context.map().extent(), context.map().zoom(), true).filter(filter2).sort(function(a2, b2) {
+ return a2.best() && !b2.best() ? -1 : b2.best() && !a2.best() ? 1 : descending(a2.area(), b2.area()) || ascending(a2.name(), b2.name()) || 0;
+ });
+ var layerLinks = layerList.selectAll("li").data(sources, function(d2, i3) {
+ return d2.id + "---" + i3;
+ });
+ layerLinks.exit().remove();
+ var enter = layerLinks.enter().append("li").classed("layer-custom", function(d2) {
+ return d2.id === "custom";
+ }).classed("best", function(d2) {
+ return d2.best();
+ });
+ var label = enter.append("label");
+ label.append("input").attr("type", type2).attr("name", "background-layer").attr("value", function(d2) {
+ return d2.id;
+ }).on("change", change);
+ label.append("span").each(function(d2) {
+ d2.label()(select_default2(this));
+ });
+ enter.filter(function(d2) {
+ return d2.id === "custom";
+ }).append("button").attr("class", "layer-browse").call(
+ uiTooltip().title(() => _t.append("settings.custom_background.tooltip")).placement(_mainLocalizer.textDirection() === "rtl" ? "right" : "left")
+ ).on("click", function(d3_event) {
+ d3_event.preventDefault();
+ editCustom();
+ }).call(svgIcon("#iD-icon-more"));
+ enter.filter(function(d2) {
+ return d2.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(d2) {
+ return context.background().showsLayer(d2);
+ }
+ selection2.selectAll("li").classed("active", active).classed("switch", function(d2) {
+ return d2.id === previousBackgroundID();
+ }).call(setTooltips).selectAll("input").property("checked", active);
+ }
+ function chooseBackground(d2) {
+ if (d2.id === "custom" && !d2.template()) {
+ return editCustom();
+ }
+ var previousBackground = context.background().baseLayerSource();
+ corePreferences("background-last-used-toggle", previousBackground.id);
+ corePreferences("background-last-used", d2.id);
+ context.background().baseLayerSource(d2);
+ }
+ function customChanged(d2) {
+ if (d2 && d2.template) {
+ _customSource.template(d2.template);
+ chooseBackground(_customSource);
} else {
- return _t.html(`QA.keepRight.errorTypes.${parentIssueType}.title`, replacements);
+ _customSource.template("");
+ chooseBackground(context.background().findSource("none"));
}
}
- function keepRightHeader(selection2) {
- const header = selection2.selectAll(".qa-header").data(_qaItem ? [_qaItem] : [], (d) => `${d.id}-${d.status || 0}`);
- header.exit().remove();
- const headerEnter = header.enter().append("div").attr("class", "qa-header");
- const iconEnter = headerEnter.append("div").attr("class", "qa-header-icon").classed("new", (d) => d.id < 0);
- iconEnter.append("div").attr("class", (d) => `preset-icon-28 qaItem ${d.service} itemId-${d.id} itemType-${d.parentIssueType}`).call(svgIcon("#iD-icon-bolt", "qaItem-fill"));
- headerEnter.append("div").attr("class", "qa-header-label").html(issueTitle);
+ function editCustom() {
+ context.container().call(_settingsCustomBackground);
}
- keepRightHeader.issue = function(val) {
- if (!arguments.length)
- return _qaItem;
- _qaItem = val;
- return keepRightHeader;
- };
- return keepRightHeader;
+ context.background().on("change.background_list", function() {
+ _backgroundList.call(updateLayerSelections);
+ });
+ context.map().on(
+ "move.background_list",
+ debounce_default(function() {
+ window.requestIdleCallback(section.reRender);
+ }, 1e3)
+ );
+ return section;
}
- // modules/ui/view_on_keepRight.js
- function uiViewOnKeepRight() {
- let _qaItem;
- function viewOnKeepRight(selection2) {
- let url;
- if (services.keepRight && _qaItem instanceof QAItem) {
- url = services.keepRight.issueURL(_qaItem);
+ // 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 x2 = +meters[0].toFixed(2);
+ var y2 = +meters[1].toFixed(2);
+ context.container().selectAll(".nudge-inner-rect").select("input").classed("error", false).property("value", x2 + ", " + y2);
+ context.container().selectAll(".nudge-reset").classed("disabled", function() {
+ return x2 === 0 && y2 === 0;
+ });
+ }
+ function resetOffset() {
+ context.background().offset([0, 0]);
+ updateValue();
+ }
+ function nudge(d2) {
+ context.background().nudge(d2, context.map().zoom());
+ updateValue();
+ }
+ function inputOffset() {
+ var input = select_default2(this);
+ var d2 = input.node().value;
+ if (d2 === "") return resetOffset();
+ d2 = d2.replace(/;/g, ",").split(",").map(function(n3) {
+ return !isNaN(n3) && n3;
+ });
+ if (d2.length !== 2 || !d2[0] || !d2[1]) {
+ input.classed("error", true);
+ return;
}
- const link2 = selection2.selectAll(".view-on-keepRight").data(url ? [url] : []);
- link2.exit().remove();
- const linkEnter = link2.enter().append("a").attr("class", "view-on-keepRight").attr("target", "_blank").attr("rel", "noopener").attr("href", (d) => d).call(svgIcon("#iD-icon-out-link", "inline"));
- linkEnter.append("span").call(_t.append("inspector.view_on_keepRight"));
+ context.background().offset(geoMetersToOffset(d2));
+ updateValue();
}
- viewOnKeepRight.what = function(val) {
- if (!arguments.length)
- return _qaItem;
- _qaItem = val;
- return viewOnKeepRight;
- };
- return viewOnKeepRight;
+ 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 d2 = [
+ -(origin[0] - latest[0]) / 4,
+ -(origin[1] - latest[1]) / 4
+ ];
+ origin = latest;
+ nudge(d2);
+ }
+ 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(d2) {
+ return _t("background.nudge.".concat(d2[0]));
+ }).attr("class", function(d2) {
+ return d2[0] + " nudge";
+ }).on("click", function(d3_event, d2) {
+ nudge(d2[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/keepRight_editor.js
- function uiKeepRightEditor(context) {
- const dispatch10 = dispatch_default("change");
- const qaDetails = uiKeepRightDetails(context);
- const qaHeader = uiKeepRightHeader(context);
- let _qaItem;
- function keepRightEditor(selection2) {
- const headerEnter = selection2.selectAll(".header").data([0]).enter().append("div").attr("class", "header fillL");
- headerEnter.append("button").attr("class", "close").attr("title", _t("icons.close")).on("click", () => context.enter(modeBrowse(context))).call(svgIcon("#iD-icon-close"));
- headerEnter.append("h2").call(_t.append("QA.keepRight.title"));
- let body = selection2.selectAll(".body").data([0]);
- body = body.enter().append("div").attr("class", "body").merge(body);
- const editor = body.selectAll(".qa-editor").data([0]);
- editor.enter().append("div").attr("class", "modal-section qa-editor").merge(editor).call(qaHeader.issue(_qaItem)).call(qaDetails.issue(_qaItem)).call(keepRightSaveSection);
- const footer = selection2.selectAll(".footer").data([0]);
- footer.enter().append("div").attr("class", "footer").merge(footer).call(uiViewOnKeepRight(context).what(_qaItem));
- }
- function keepRightSaveSection(selection2) {
- const isSelected = _qaItem && _qaItem.id === context.selectedErrorID();
- const isShown = _qaItem && (isSelected || _qaItem.newComment || _qaItem.comment);
- let saveSection = selection2.selectAll(".qa-save").data(isShown ? [_qaItem] : [], (d) => `${d.id}-${d.status || 0}`);
- saveSection.exit().remove();
- const saveSectionEnter = saveSection.enter().append("div").attr("class", "qa-save save-section cf");
- saveSectionEnter.append("h4").attr("class", ".qa-save-header").call(_t.append("QA.keepRight.comment"));
- saveSectionEnter.append("textarea").attr("class", "new-comment-input").attr("placeholder", _t("QA.keepRight.comment_placeholder")).attr("maxlength", 1e3).property("value", (d) => d.newComment || d.comment).call(utilNoAuto).on("input", changeInput).on("blur", changeInput);
- saveSection = saveSectionEnter.merge(saveSection).call(qaSaveButtons);
- function changeInput() {
- const input = select_default2(this);
- let val = input.property("value").trim();
- if (val === _qaItem.comment) {
- val = void 0;
- }
- _qaItem = _qaItem.update({ newComment: val });
- const qaService = services.keepRight;
- if (qaService) {
- qaService.replaceItem(_qaItem);
+ // 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(d2, i3, nodes) {
+ var item = select_default2(this).select("label");
+ var span = item.select("span");
+ var placement = i3 < nodes.length / 2 ? "bottom" : "top";
+ var description = d2.description();
+ var isOverflowing = span.property("clientWidth") !== span.property("scrollWidth");
+ item.call(uiTooltip().destroyAny);
+ if (description || isOverflowing) {
+ item.call(
+ uiTooltip().placement(placement).title(() => description || d2.name())
+ );
}
- saveSection.call(qaSaveButtons);
+ });
+ }
+ function updateLayerSelections(selection2) {
+ function active(d2) {
+ return context.background().showsLayer(d2);
}
+ selection2.selectAll("li").classed("active", active).call(setTooltips).selectAll("input").property("checked", active);
}
- function qaSaveButtons(selection2) {
- const isSelected = _qaItem && _qaItem.id === context.selectedErrorID();
- let buttonSection = selection2.selectAll(".buttons").data(isSelected ? [_qaItem] : [], (d) => d.status + d.id);
- buttonSection.exit().remove();
- const buttonEnter = buttonSection.enter().append("div").attr("class", "buttons");
- buttonEnter.append("button").attr("class", "button comment-button action").call(_t.append("QA.keepRight.save_comment"));
- buttonEnter.append("button").attr("class", "button close-button action");
- buttonEnter.append("button").attr("class", "button ignore-button action");
- buttonSection = buttonSection.merge(buttonEnter);
- buttonSection.select(".comment-button").attr("disabled", (d) => d.newComment ? null : true).on("click.comment", function(d3_event, d) {
- this.blur();
- const qaService = services.keepRight;
- if (qaService) {
- qaService.postUpdate(d, (err, item) => dispatch10.call("change", item));
- }
+ function chooseOverlay(d3_event, d2) {
+ d3_event.preventDefault();
+ context.background().toggleOverlayLayer(d2);
+ _overlayList.call(updateLayerSelections);
+ document.activeElement.blur();
+ }
+ function drawListItems(layerList, type2, change, filter2) {
+ var sources = context.background().sources(context.map().extent(), context.map().zoom(), true).filter(filter2);
+ var layerLinks = layerList.selectAll("li").data(sources, function(d2) {
+ return d2.name();
});
- buttonSection.select(".close-button").html((d) => {
- const andComment = d.newComment ? "_comment" : "";
- return _t.html(`QA.keepRight.close${andComment}`);
- }).on("click.close", function(d3_event, d) {
- this.blur();
- const qaService = services.keepRight;
- if (qaService) {
- d.newStatus = "ignore_t";
- qaService.postUpdate(d, (err, item) => dispatch10.call("change", item));
+ layerLinks.exit().remove();
+ var enter = layerLinks.enter().append("li");
+ var label = enter.append("label");
+ label.append("input").attr("type", type2).attr("name", "layers").on("change", change);
+ label.append("span").each(function(d2) {
+ d2.label()(select_default2(this));
+ });
+ layerList.selectAll("li").sort(sortSources);
+ layerList.call(updateLayerSelections);
+ function sortSources(a2, b2) {
+ return a2.best() && !b2.best() ? -1 : b2.best() && !a2.best() ? 1 : descending(a2.area(), b2.area()) || ascending(a2.name(), b2.name()) || 0;
+ }
+ }
+ function renderDisclosureContent(selection2) {
+ var container = selection2.selectAll(".layer-overlay-list").data([0]);
+ _overlayList = container.enter().append("ul").attr("class", "layer-list layer-overlay-list").attr("dir", "auto").merge(container);
+ _overlayList.call(drawListItems, "checkbox", chooseOverlay, function(d2) {
+ return !d2.isHidden() && d2.overlay;
+ });
+ }
+ context.map().on(
+ "move.overlay_list",
+ debounce_default(function() {
+ window.requestIdleCallback(section.reRender);
+ }, 1e3)
+ );
+ return section;
+ }
+
+ // modules/ui/panes/background.js
+ function uiPaneBackground(context) {
+ var backgroundPane = uiPane("background", context).key(_t("background.key")).label(_t.append("background.title")).description(_t.append("background.description")).iconName("iD-icon-layers").sections([
+ uiSectionBackgroundList(context),
+ uiSectionOverlayList(context),
+ uiSectionBackgroundDisplayOptions(context),
+ uiSectionBackgroundOffset(context)
+ ]);
+ return backgroundPane;
+ }
+
+ // modules/ui/panes/help.js
+ function uiPaneHelp(context) {
+ var docKeys = [
+ ["help", [
+ "welcome",
+ "open_data_h",
+ "open_data",
+ "before_start_h",
+ "before_start",
+ "open_source_h",
+ "open_source",
+ "open_source_attribution",
+ "open_source_help"
+ ]],
+ ["overview", [
+ "navigation_h",
+ "navigation_drag",
+ "navigation_zoom",
+ "features_h",
+ "features",
+ "nodes_ways"
+ ]],
+ ["editing", [
+ "select_h",
+ "select_left_click",
+ "select_right_click",
+ "select_space",
+ "multiselect_h",
+ "multiselect",
+ "multiselect_shift_click",
+ "multiselect_lasso",
+ "undo_redo_h",
+ "undo_redo",
+ "save_h",
+ "save",
+ "save_validation",
+ "upload_h",
+ "upload",
+ "backups_h",
+ "backups",
+ "keyboard_h",
+ "keyboard"
+ ]],
+ ["feature_editor", [
+ "intro",
+ "definitions",
+ "type_h",
+ "type",
+ "type_picker",
+ "fields_h",
+ "fields_all_fields",
+ "fields_example",
+ "fields_add_field",
+ "tags_h",
+ "tags_all_tags",
+ "tags_resources"
+ ]],
+ ["points", [
+ "intro",
+ "add_point_h",
+ "add_point",
+ "add_point_finish",
+ "move_point_h",
+ "move_point",
+ "delete_point_h",
+ "delete_point",
+ "delete_point_command"
+ ]],
+ ["lines", [
+ "intro",
+ "add_line_h",
+ "add_line",
+ "add_line_draw",
+ "add_line_continue",
+ "add_line_finish",
+ "modify_line_h",
+ "modify_line_dragnode",
+ "modify_line_addnode",
+ "connect_line_h",
+ "connect_line",
+ "connect_line_display",
+ "connect_line_drag",
+ "connect_line_tag",
+ "disconnect_line_h",
+ "disconnect_line_command",
+ "move_line_h",
+ "move_line_command",
+ "move_line_connected",
+ "delete_line_h",
+ "delete_line",
+ "delete_line_command"
+ ]],
+ ["areas", [
+ "intro",
+ "point_or_area_h",
+ "point_or_area",
+ "add_area_h",
+ "add_area_command",
+ "add_area_draw",
+ "add_area_continue",
+ "add_area_finish",
+ "square_area_h",
+ "square_area_command",
+ "modify_area_h",
+ "modify_area_dragnode",
+ "modify_area_addnode",
+ "delete_area_h",
+ "delete_area",
+ "delete_area_command"
+ ]],
+ ["relations", [
+ "intro",
+ "edit_relation_h",
+ "edit_relation",
+ "edit_relation_add",
+ "edit_relation_delete",
+ "maintain_relation_h",
+ "maintain_relation",
+ "relation_types_h",
+ "multipolygon_h",
+ "multipolygon",
+ "multipolygon_create",
+ "multipolygon_merge",
+ "turn_restriction_h",
+ "turn_restriction",
+ "turn_restriction_field",
+ "turn_restriction_editing",
+ "route_h",
+ "route",
+ "route_add",
+ "boundary_h",
+ "boundary",
+ "boundary_add"
+ ]],
+ ["operations", [
+ "intro",
+ "intro_2",
+ "straighten",
+ "orthogonalize",
+ "circularize",
+ "move",
+ "rotate",
+ "reflect",
+ "continue",
+ "reverse",
+ "disconnect",
+ "split",
+ "extract",
+ "merge",
+ "delete",
+ "downgrade",
+ "copy_paste"
+ ]],
+ ["notes", [
+ "intro",
+ "add_note_h",
+ "add_note",
+ "place_note",
+ "move_note",
+ "update_note_h",
+ "update_note",
+ "save_note_h",
+ "save_note"
+ ]],
+ ["imagery", [
+ "intro",
+ "sources_h",
+ "choosing",
+ "sources",
+ "offsets_h",
+ "offset",
+ "offset_change"
+ ]],
+ ["streetlevel", [
+ "intro",
+ "using_h",
+ "using",
+ "photos",
+ "viewer"
+ ]],
+ ["gps", [
+ "intro",
+ "survey",
+ "using_h",
+ "using",
+ "tracing",
+ "upload"
+ ]],
+ ["qa", [
+ "intro",
+ "tools_h",
+ "tools",
+ "issues_h",
+ "issues"
+ ]]
+ ];
+ var headings = {
+ "help.help.open_data_h": 3,
+ "help.help.before_start_h": 3,
+ "help.help.open_source_h": 3,
+ "help.overview.navigation_h": 3,
+ "help.overview.features_h": 3,
+ "help.editing.select_h": 3,
+ "help.editing.multiselect_h": 3,
+ "help.editing.undo_redo_h": 3,
+ "help.editing.save_h": 3,
+ "help.editing.upload_h": 3,
+ "help.editing.backups_h": 3,
+ "help.editing.keyboard_h": 3,
+ "help.feature_editor.type_h": 3,
+ "help.feature_editor.fields_h": 3,
+ "help.feature_editor.tags_h": 3,
+ "help.points.add_point_h": 3,
+ "help.points.move_point_h": 3,
+ "help.points.delete_point_h": 3,
+ "help.lines.add_line_h": 3,
+ "help.lines.modify_line_h": 3,
+ "help.lines.connect_line_h": 3,
+ "help.lines.disconnect_line_h": 3,
+ "help.lines.move_line_h": 3,
+ "help.lines.delete_line_h": 3,
+ "help.areas.point_or_area_h": 3,
+ "help.areas.add_area_h": 3,
+ "help.areas.square_area_h": 3,
+ "help.areas.modify_area_h": 3,
+ "help.areas.delete_area_h": 3,
+ "help.relations.edit_relation_h": 3,
+ "help.relations.maintain_relation_h": 3,
+ "help.relations.relation_types_h": 2,
+ "help.relations.multipolygon_h": 3,
+ "help.relations.turn_restriction_h": 3,
+ "help.relations.route_h": 3,
+ "help.relations.boundary_h": 3,
+ "help.notes.add_note_h": 3,
+ "help.notes.update_note_h": 3,
+ "help.notes.save_note_h": 3,
+ "help.imagery.sources_h": 3,
+ "help.imagery.offsets_h": 3,
+ "help.streetlevel.using_h": 3,
+ "help.gps.using_h": 3,
+ "help.qa.tools_h": 3,
+ "help.qa.issues_h": 3
+ };
+ var docs = docKeys.map(function(key) {
+ var helpkey = "help." + key[0];
+ var helpPaneReplacements = { version: context.version };
+ var text = key[1].reduce(function(all, part) {
+ var subkey = helpkey + "." + part;
+ var depth = headings[subkey];
+ var hhh = depth ? Array(depth + 1).join("#") + " " : "";
+ return all + hhh + helpHtml(subkey, helpPaneReplacements) + "\n\n";
+ }, "");
+ return {
+ title: _t.html(helpkey + ".title"),
+ content: marked(text.trim()).replace(//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);
+ }
+ 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"));
+ }
}
- });
- buttonSection.select(".ignore-button").html((d) => {
- const andComment = d.newComment ? "_comment" : "";
- return _t.html(`QA.keepRight.ignore${andComment}`);
- }).on("click.ignore", function(d3_event, d) {
- this.blur();
- const qaService = services.keepRight;
- if (qaService) {
- d.newStatus = "ignore";
- qaService.postUpdate(d, (err, item) => dispatch10.call("change", item));
+ 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));
});
- }
- keepRightEditor.error = function(val) {
- if (!arguments.length)
- return _qaItem;
- _qaItem = val;
- return keepRightEditor;
+ 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(keepRightEditor, dispatch10, "on");
+ return helpPane;
}
- // modules/ui/lasso.js
- function uiLasso(context) {
- var group, polygon2;
- lasso.coordinates = [];
- function lasso(selection2) {
- context.container().classed("lasso", true);
- group = selection2.append("g").attr("class", "lasso hide");
- polygon2 = group.append("path").attr("class", "lasso-path");
- group.call(uiToggle(true));
+ // 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"
+ };
}
- function draw() {
- if (polygon2) {
- polygon2.data([lasso.coordinates]).attr("d", function(d) {
- return "M" + d.join(" L") + " Z";
- });
- }
+ function reloadIssues() {
+ _issues = context.validator().getIssuesBySeverity(getOptions())[severity];
}
- lasso.extent = function() {
- return lasso.coordinates.reduce(function(extent, point) {
- return extent.extend(geoExtent(point));
- }, geoExtent());
- };
- lasso.p = function(_) {
- if (!arguments.length)
- return lasso;
- lasso.coordinates.push(_);
- draw();
- return lasso;
- };
- lasso.close = function() {
- if (group) {
- group.call(uiToggle(false, function() {
- select_default2(this).remove();
- }));
- }
- context.container().classed("lasso", false);
- };
- return lasso;
- }
-
- // modules/ui/note_comments.js
- function uiNoteComments() {
- var _note;
- function noteComments(selection2) {
- if (_note.isNew())
- return;
- var comments = selection2.selectAll(".comments-container").data([0]);
- comments = comments.enter().append("div").attr("class", "comments-container").merge(comments);
- var commentEnter = comments.selectAll(".comment").data(_note.comments).enter().append("div").attr("class", "comment");
- commentEnter.append("div").attr("class", function(d) {
- return "comment-avatar user-" + d.uid;
- }).call(svgIcon("#iD-icon-avatar", "comment-avatar-icon"));
- var mainEnter = commentEnter.append("div").attr("class", "comment-main");
- var metadataEnter = mainEnter.append("div").attr("class", "comment-metadata");
- metadataEnter.append("div").attr("class", "comment-author").each(function(d) {
- var selection3 = select_default2(this);
- var osm = services.osm;
- if (osm && d.user) {
- selection3 = selection3.append("a").attr("class", "comment-author-link").attr("href", osm.userURL(d.user)).attr("target", "_blank");
- }
- if (d.user) {
- selection3.text(d.user);
- } else {
- selection3.call(_t.append("note.anonymous"));
- }
- });
- metadataEnter.append("div").attr("class", "comment-date").html(function(d) {
- return _t.html("note.status." + d.action, { when: localeDateString2(d.date) });
+ 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;
});
- mainEnter.append("div").attr("class", "comment-text").html(function(d) {
- return d.html;
- }).selectAll("a").attr("rel", "noopener nofollow").attr("target", "_blank");
- comments.call(replaceAvatars);
+ issues = issues.slice(0, 1e3);
+ selection2.call(drawIssuesList, issues);
}
- function replaceAvatars(selection2) {
- var showThirdPartyIcons = corePreferences("preferences.privacy.thirdpartyicons") || "true";
- var osm = services.osm;
- if (showThirdPartyIcons !== "true" || !osm)
- return;
- var uids = {};
- _note.comments.forEach(function(d) {
- if (d.uid)
- uids[d.uid] = true;
- });
- Object.keys(uids).forEach(function(uid) {
- osm.loadUser(uid, function(err, user) {
- if (!user || !user.image_url)
- return;
- selection2.selectAll(".comment-avatar.user-" + uid).html("").append("img").attr("class", "icon comment-avatar-icon").attr("src", user.image_url).attr("alt", user.display_name);
- });
+ 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;
});
- }
- function localeDateString2(s) {
- if (!s)
- return null;
- var options2 = { day: "numeric", month: "short", year: "numeric" };
- s = s.replace(/-/g, "/");
- var d = new Date(s);
- if (isNaN(d.getTime()))
- return null;
- return d.toLocaleDateString(_mainLocalizer.localeCode(), options2);
- }
- noteComments.note = function(val) {
- if (!arguments.length)
- return _note;
- _note = val;
- return noteComments;
- };
- return noteComments;
- }
-
- // modules/ui/note_header.js
- function uiNoteHeader() {
- var _note;
- function noteHeader(selection2) {
- var header = selection2.selectAll(".note-header").data(_note ? [_note] : [], function(d) {
- return d.status + d.id;
+ items.exit().remove();
+ var itemsEnter = items.enter().append("li").attr("class", function(d2) {
+ return "issue severity-" + d2.severity;
});
- header.exit().remove();
- var headerEnter = header.enter().append("div").attr("class", "note-header");
- var iconEnter = headerEnter.append("div").attr("class", function(d) {
- return "note-header-icon " + d.status;
- }).classed("new", function(d) {
- return d.id < 0;
+ 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);
});
- iconEnter.append("div").attr("class", "preset-icon-28").call(svgIcon("#iD-icon-note", "note-fill"));
- iconEnter.each(function(d) {
- var statusIcon;
- if (d.id < 0) {
- statusIcon = "#iD-icon-plus";
- } else if (d.status === "open") {
- statusIcon = "#iD-icon-close";
- } else {
- statusIcon = "#iD-icon-apply";
- }
- iconEnter.append("div").attr("class", "note-icon-annotation").attr("title", _t("icons.close")).call(svgIcon(statusIcon, "icon-annotation"));
+ 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));
});
- headerEnter.append("div").attr("class", "note-header-label").html(function(d) {
- if (_note.isNew()) {
- return _t.html("note.new");
- }
- return _t.html("note.note") + " " + d.id + " " + (d.status === "closed" ? _t.html("note.closed") : "");
+ 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));
});
}
- noteHeader.note = function(val) {
- if (!arguments.length)
- return _note;
- _note = val;
- return noteHeader;
- };
- return noteHeader;
- }
-
- // modules/ui/note_report.js
- function uiNoteReport() {
- var _note;
- function noteReport(selection2) {
- var url;
- if (services.osm && _note instanceof osmNote && !_note.isNew()) {
- url = services.osm.noteReportURL(_note);
- }
- var link2 = selection2.selectAll(".note-report").data(url ? [url] : []);
- link2.exit().remove();
- var linkEnter = link2.enter().append("a").attr("class", "note-report").attr("target", "_blank").attr("href", function(d) {
- return d;
- }).call(svgIcon("#iD-icon-out-link", "inline"));
- linkEnter.append("span").call(_t.append("note.report"));
- }
- noteReport.note = function(val) {
- if (!arguments.length)
- return _note;
- _note = val;
- return noteReport;
- };
- return noteReport;
+ context.validator().on("validated.uiSectionValidationIssues" + id2, function() {
+ window.requestIdleCallback(function() {
+ reloadIssues();
+ section.reRender();
+ });
+ });
+ context.map().on(
+ "move.uiSectionValidationIssues" + id2,
+ debounce_default(function() {
+ window.requestIdleCallback(function() {
+ if (getOptions().where === "visible") {
+ reloadIssues();
+ }
+ section.reRender();
+ });
+ }, 1e3)
+ );
+ return section;
}
- // modules/ui/note_editor.js
- function uiNoteEditor(context) {
- var dispatch10 = dispatch_default("change");
- var noteComments = uiNoteComments(context);
- var noteHeader = uiNoteHeader();
- var _note;
- var _newNote;
- function noteEditor(selection2) {
- var header = selection2.selectAll(".header").data([0]);
- var headerEnter = header.enter().append("div").attr("class", "header fillL");
- headerEnter.append("button").attr("class", "close").attr("title", _t("icons.close")).on("click", function() {
- context.enter(modeBrowse(context));
- }).call(svgIcon("#iD-icon-close"));
- headerEnter.append("h2").call(_t.append("note.title"));
- var body = selection2.selectAll(".body").data([0]);
- body = body.enter().append("div").attr("class", "body").merge(body);
- var editor = body.selectAll(".note-editor").data([0]);
- editor.enter().append("div").attr("class", "modal-section note-editor").merge(editor).call(noteHeader.note(_note)).call(noteComments.note(_note)).call(noteSaveSection);
- var footer = selection2.selectAll(".footer").data([0]);
- footer.enter().append("div").attr("class", "footer").merge(footer).call(uiViewOnOSM(context).what(_note)).call(uiNoteReport(context).note(_note));
- var osm = services.osm;
- if (osm) {
- osm.on("change.note-save", function() {
- selection2.call(noteEditor);
- });
- }
- }
- function noteSaveSection(selection2) {
- var isSelected = _note && _note.id === context.selectedNoteID();
- var noteSave = selection2.selectAll(".note-save").data(isSelected ? [_note] : [], function(d) {
- return d.status + d.id;
+ // 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;
});
- noteSave.exit().remove();
- var noteSaveEnter = noteSave.enter().append("div").attr("class", "note-save save-section cf");
- noteSaveEnter.append("h4").attr("class", ".note-save-header").html(function() {
- return _note.isNew() ? _t.html("note.newDescription") : _t.html("note.newComment");
+ var optionsEnter = options2.enter().append("div").attr("class", function(d2) {
+ return "issues-option issues-option-" + d2.key;
});
- var commentTextarea = noteSaveEnter.append("textarea").attr("class", "new-comment-input").attr("placeholder", _t("note.inputPlaceholder")).attr("maxlength", 1e3).property("value", function(d) {
- return d.newComment;
- }).call(utilNoAuto).on("keydown.note-input", keydown).on("input.note-input", changeInput).on("blur.note-input", changeInput);
- if (!commentTextarea.empty() && _newNote) {
- commentTextarea.node().focus();
- }
- noteSave = noteSaveEnter.merge(noteSave).call(userDetails).call(noteSaveButtons);
- function keydown(d3_event) {
- if (!(d3_event.keyCode === 13 && d3_event.metaKey))
- return;
- var osm = services.osm;
- if (!osm)
- return;
- var hasAuth = osm.authenticated();
- if (!hasAuth)
- return;
- if (!_note.newComment)
- return;
- d3_event.preventDefault();
- select_default2(this).on("keydown.note-input", null);
- window.setTimeout(function() {
- if (_note.isNew()) {
- noteSave.selectAll(".save-button").node().focus();
- clickSave(_note);
- } else {
- noteSave.selectAll(".comment-button").node().focus();
- clickComment(_note);
- }
- }, 10);
- }
- function changeInput() {
- var input = select_default2(this);
- var val = input.property("value").trim() || void 0;
- _note = _note.update({ newComment: val });
- var osm = services.osm;
- if (osm) {
- osm.replaceNote(_note);
- }
- noteSave.call(noteSaveButtons);
- }
- }
- function userDetails(selection2) {
- var detailSection = selection2.selectAll(".detail-section").data([0]);
- detailSection = detailSection.enter().append("div").attr("class", "detail-section").merge(detailSection);
- var osm = services.osm;
- if (!osm)
- return;
- var hasAuth = osm.authenticated();
- var authWarning = detailSection.selectAll(".auth-warning").data(hasAuth ? [] : [0]);
- authWarning.exit().transition().duration(200).style("opacity", 0).remove();
- var authEnter = authWarning.enter().insert("div", ".tag-reference-body").attr("class", "field-warning auth-warning").style("opacity", 0);
- authEnter.call(svgIcon("#iD-icon-alert", "inline"));
- authEnter.append("span").call(_t.append("note.login"));
- authEnter.append("a").attr("target", "_blank").call(svgIcon("#iD-icon-out-link", "inline")).append("span").call(_t.append("login")).on("click.note-login", function(d3_event) {
- d3_event.preventDefault();
- osm.authenticate();
+ optionsEnter.append("div").attr("class", "issues-option-title").html(function(d2) {
+ return _t.html("issues.options." + d2.key + ".title");
});
- authEnter.transition().duration(200).style("opacity", 1);
- var prose = detailSection.selectAll(".note-save-prose").data(hasAuth ? [0] : []);
- prose.exit().remove();
- prose = prose.enter().append("p").attr("class", "note-save-prose").call(_t.append("note.upload_explanation")).merge(prose);
- osm.userDetails(function(err, user) {
- if (err)
- return;
- var userLink = select_default2(document.createElement("div"));
- if (user.image_url) {
- userLink.append("img").attr("src", user.image_url).attr("class", "icon pre-text user-icon");
- }
- userLink.append("a").attr("class", "user-info").text(user.display_name).attr("href", osm.userURL(user.display_name)).attr("target", "_blank");
- prose.html(_t.html("note.upload_explanation_with_user", { user: { html: userLink.html() } }));
+ 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);
});
- }
- function noteSaveButtons(selection2) {
- var osm = services.osm;
- var hasAuth = osm && osm.authenticated();
- var isSelected = _note && _note.id === context.selectedNoteID();
- var buttonSection = selection2.selectAll(".buttons").data(isSelected ? [_note] : [], function(d) {
- return d.status + d.id;
+ valuesEnter.append("span").html(function(d2) {
+ return _t.html("issues.options." + d2.key + "." + d2.value);
});
- buttonSection.exit().remove();
- var buttonEnter = buttonSection.enter().append("div").attr("class", "buttons");
- if (_note.isNew()) {
- buttonEnter.append("button").attr("class", "button cancel-button secondary-action").call(_t.append("confirm.cancel"));
- buttonEnter.append("button").attr("class", "button save-button action").call(_t.append("note.save"));
- } else {
- buttonEnter.append("button").attr("class", "button status-button action");
- buttonEnter.append("button").attr("class", "button comment-button action").call(_t.append("note.comment"));
- }
- buttonSection = buttonSection.merge(buttonEnter);
- buttonSection.select(".cancel-button").on("click.cancel", clickCancel);
- buttonSection.select(".save-button").attr("disabled", isSaveDisabled).on("click.save", clickSave);
- buttonSection.select(".status-button").attr("disabled", hasAuth ? null : true).html(function(d) {
- var action = d.status === "open" ? "close" : "open";
- var andComment = d.newComment ? "_comment" : "";
- return _t.html("note." + action + andComment);
- }).on("click.status", clickStatus);
- buttonSection.select(".comment-button").attr("disabled", isSaveDisabled).on("click.comment", clickComment);
- function isSaveDisabled(d) {
- return hasAuth && d.status === "open" && d.newComment ? null : true;
- }
- }
- function clickCancel(d3_event, d) {
- this.blur();
- var osm = services.osm;
- if (osm) {
- osm.removeNote(d);
- }
- context.enter(modeBrowse(context));
- dispatch10.call("change");
- }
- function clickSave(d3_event, d) {
- this.blur();
- var osm = services.osm;
- if (osm) {
- osm.postNoteCreate(d, function(err, note) {
- dispatch10.call("change", note);
- });
- }
- }
- function clickStatus(d3_event, d) {
- this.blur();
- var osm = services.osm;
- if (osm) {
- var setStatus = d.status === "open" ? "closed" : "open";
- osm.postNoteUpdate(d, setStatus, function(err, note) {
- dispatch10.call("change", note);
- });
- }
- }
- function clickComment(d3_event, d) {
- this.blur();
- var osm = services.osm;
- if (osm) {
- osm.postNoteUpdate(d, d.status, function(err, note) {
- dispatch10.call("change", note);
- });
- }
}
- noteEditor.note = function(val) {
- if (!arguments.length)
- return _note;
- _note = val;
- return noteEditor;
- };
- noteEditor.newNote = function(val) {
- if (!arguments.length)
- return _newNote;
- _newNote = val;
- return noteEditor;
- };
- return utilRebind(noteEditor, dispatch10, "on");
- }
-
- // modules/ui/source_switch.js
- function uiSourceSwitch(context) {
- var keys;
- function click(d3_event) {
- d3_event.preventDefault();
- var osm = context.connection();
- if (!osm)
- return;
- if (context.inIntro())
- return;
- if (context.history().hasChanges() && !window.confirm(_t("source_switch.lose_changes")))
- return;
- var isLive = select_default2(this).classed("live");
- isLive = !isLive;
- context.enter(modeBrowse(context));
- context.history().clearSaved();
- context.flush();
- select_default2(this).html(isLive ? _t.html("source_switch.live") : _t.html("source_switch.dev")).classed("live", isLive).classed("chip", isLive);
- osm.switch(isLive ? keys[0] : keys[1]);
+ function getOptions() {
+ return {
+ what: corePreferences("validate-what") || "edited",
+ // 'all', 'edited'
+ where: corePreferences("validate-where") || "all"
+ // 'all', 'visible'
+ };
}
- var sourceSwitch = function(selection2) {
- selection2.append("a").attr("href", "#").call(_t.append("source_switch.live")).attr("class", "live chip").on("click", click);
- };
- sourceSwitch.keys = function(_) {
- if (!arguments.length)
- return keys;
- keys = _;
- return sourceSwitch;
- };
- return sourceSwitch;
- }
-
- // modules/ui/spinner.js
- function uiSpinner(context) {
- var osm = context.connection();
- return function(selection2) {
- var img = selection2.append("img").attr("src", context.imagePath("loader-black.gif")).style("opacity", 0);
- if (osm) {
- osm.on("loading.spinner", function() {
- img.transition().style("opacity", 1);
- }).on("loaded.spinner", function() {
- img.transition().style("opacity", 0);
- });
+ function updateOptionValue(d3_event, d2, val) {
+ if (!val && d3_event && d3_event.target) {
+ val = d3_event.target.value;
}
- };
- }
-
- // modules/ui/sections/privacy.js
- function uiSectionPrivacy(context) {
- let section = uiSection("preferences-third-party", context).label(_t.html("preferences.privacy.title")).disclosureContent(renderDisclosureContent);
- function renderDisclosureContent(selection2) {
- selection2.selectAll(".privacy-options-list").data([0]).enter().append("ul").attr("class", "layer-list privacy-options-list");
- let thirdPartyIconsEnter = selection2.select(".privacy-options-list").selectAll(".privacy-third-party-icons-item").data([corePreferences("preferences.privacy.thirdpartyicons") || "true"]).enter().append("li").attr("class", "privacy-third-party-icons-item").append("label").call(uiTooltip().title(_t.html("preferences.privacy.third_party_icons.tooltip")).placement("bottom"));
- thirdPartyIconsEnter.append("input").attr("type", "checkbox").on("change", (d3_event, d) => {
- d3_event.preventDefault();
- corePreferences("preferences.privacy.thirdpartyicons", d === "true" ? "false" : "true");
- });
- thirdPartyIconsEnter.append("span").call(_t.append("preferences.privacy.third_party_icons.description"));
- selection2.selectAll(".privacy-third-party-icons-item").classed("active", (d) => d === "true").select("input").property("checked", (d) => d === "true");
- selection2.selectAll(".privacy-link").data([0]).enter().append("div").attr("class", "privacy-link").append("a").attr("target", "_blank").call(svgIcon("#iD-icon-out-link", "inline")).attr("href", "https://github.com/openstreetmap/iD/blob/release/PRIVACY.md").append("span").call(_t.append("preferences.privacy.privacy_link"));
+ corePreferences("validate-" + d2, val);
+ context.validator().validate();
}
- corePreferences.onChange("preferences.privacy.thirdpartyicons", section.reRender);
return section;
}
- // modules/ui/splash.js
- function uiSplash(context) {
- return (selection2) => {
- if (context.history().hasRestorableChanges())
- return;
- let updateMessage = "";
- const sawPrivacyVersion = corePreferences("sawPrivacyVersion");
- let showSplash = !corePreferences("sawSplash");
- if (sawPrivacyVersion !== context.privacyVersion) {
- updateMessage = _t("splash.privacy_update");
- showSplash = true;
- }
- if (!showSplash)
- return;
- corePreferences("sawSplash", true);
- corePreferences("sawPrivacyVersion", context.privacyVersion);
- _mainFileFetcher.get("intro_graph");
- let modalSelection = uiModal(selection2);
- modalSelection.select(".modal").attr("class", "modal-splash modal");
- let introModal = modalSelection.select(".content").append("div").attr("class", "fillL");
- introModal.append("div").attr("class", "modal-section").append("h3").call(_t.append("splash.welcome"));
- let modalSection = introModal.append("div").attr("class", "modal-section");
- modalSection.append("p").html(_t.html("splash.text", {
- version: context.version,
- website: { html: '' + _t.html("splash.changelog") + "" },
- github: { html: 'github.com' }
- }));
- modalSection.append("p").html(_t.html("splash.privacy", {
- updateMessage,
- privacyLink: { html: '' + _t("splash.privacy_policy") + "" }
- }));
- uiSectionPrivacy(context).label(_t.html("splash.privacy_settings")).render(modalSection);
- let buttonWrap = introModal.append("div").attr("class", "modal-actions");
- let walkthrough = buttonWrap.append("button").attr("class", "walkthrough").on("click", () => {
- context.container().call(uiIntro(context));
- modalSelection.close();
- });
- walkthrough.append("svg").attr("class", "logo logo-walkthrough").append("use").attr("xlink:href", "#iD-logo-walkthrough");
- walkthrough.append("div").call(_t.append("splash.walkthrough"));
- let startEditing = buttonWrap.append("button").attr("class", "start-editing").on("click", modalSelection.close);
- startEditing.append("svg").attr("class", "logo logo-features").append("use").attr("xlink:href", "#iD-logo-features");
- startEditing.append("div").call(_t.append("splash.start"));
- modalSelection.select("button.close").attr("class", "hide");
- };
- }
-
- // modules/ui/status.js
- function uiStatus(context) {
- var osm = context.connection();
- return function(selection2) {
- if (!osm)
- return;
- function update(err, apiStatus) {
- selection2.html("");
- if (err) {
- if (apiStatus === "connectionSwitched") {
- return;
- } else if (apiStatus === "rateLimited") {
- selection2.call(_t.append("osm_api_status.message.rateLimit")).append("a").attr("href", "#").attr("class", "api-status-login").attr("target", "_blank").call(svgIcon("#iD-icon-out-link", "inline")).append("span").call(_t.append("login")).on("click.login", function(d3_event) {
- d3_event.preventDefault();
- osm.authenticate();
- });
- } else {
- var throttledRetry = throttle_default(function() {
- context.loadTiles(context.projection);
- osm.reloadApiStatus();
- }, 2e3);
- selection2.call(_t.append("osm_api_status.message.error", { suffix: " " })).append("a").attr("href", "#").call(_t.append("osm_api_status.retry")).on("click.retry", function(d3_event) {
- d3_event.preventDefault();
- throttledRetry();
- });
- }
- } else if (apiStatus === "readonly") {
- selection2.call(_t.append("osm_api_status.message.readonly"));
- } else if (apiStatus === "offline") {
- selection2.call(_t.append("osm_api_status.message.offline"));
- }
- selection2.attr("class", "api-status " + (err ? "error" : apiStatus));
- }
- osm.on("apiStatusChange.uiStatus", update);
- context.history().on("storage_error", () => {
- selection2.selectAll("span.local-storage-full").remove();
- selection2.append("span").attr("class", "local-storage-full").call(_t.append("osm_api_status.message.local_storage_full"));
- selection2.classed("error", true);
- });
- window.setInterval(function() {
- osm.reloadApiStatus();
- }, 9e4);
- osm.reloadApiStatus();
- };
- }
-
- // node_modules/osm-community-index/lib/simplify.js
- var import_diacritics3 = __toESM(require_diacritics(), 1);
- function simplify2(str2) {
- if (typeof str2 !== "string")
- return "";
- return import_diacritics3.default.remove(str2.replace(/&/g, "and").replace(/Ä°/ig, "i").replace(/[\s\-=_!"#%'*{},.\/:;?\(\)\[\]@\\$\^*+<>«»~`â\u00a1\u00a7\u00b6\u00b7\u00bf\u037e\u0387\u055a-\u055f\u0589\u05c0\u05c3\u05c6\u05f3\u05f4\u0609\u060a\u060c\u060d\u061b\u061e\u061f\u066a-\u066d\u06d4\u0700-\u070d\u07f7-\u07f9\u0830-\u083e\u085e\u0964\u0965\u0970\u0af0\u0df4\u0e4f\u0e5a\u0e5b\u0f04-\u0f12\u0f14\u0f85\u0fd0-\u0fd4\u0fd9\u0fda\u104a-\u104f\u10fb\u1360-\u1368\u166d\u166e\u16eb-\u16ed\u1735\u1736\u17d4-\u17d6\u17d8-\u17da\u1800-\u1805\u1807-\u180a\u1944\u1945\u1a1e\u1a1f\u1aa0-\u1aa6\u1aa8-\u1aad\u1b5a-\u1b60\u1bfc-\u1bff\u1c3b-\u1c3f\u1c7e\u1c7f\u1cc0-\u1cc7\u1cd3\u200b-\u200f\u2016\u2017\u2020-\u2027\u2030-\u2038\u203b-\u203e\u2041-\u2043\u2047-\u2051\u2053\u2055-\u205e\u2cf9-\u2cfc\u2cfe\u2cff\u2d70\u2e00\u2e01\u2e06-\u2e08\u2e0b\u2e0e-\u2e16\u2e18\u2e19\u2e1b\u2e1e\u2e1f\u2e2a-\u2e2e\u2e30-\u2e39\u3001-\u3003\u303d\u30fb\ua4fe\ua4ff\ua60d-\ua60f\ua673\ua67e\ua6f2-\ua6f7\ua874-\ua877\ua8ce\ua8cf\ua8f8-\ua8fa\ua92e\ua92f\ua95f\ua9c1-\ua9cd\ua9de\ua9df\uaa5c-\uaa5f\uaade\uaadf\uaaf0\uaaf1\uabeb\ufe10-\ufe16\ufe19\ufe30\ufe45\ufe46\ufe49-\ufe4c\ufe50-\ufe52\ufe54-\ufe57\ufe5f-\ufe61\ufe68\ufe6a\ufe6b\ufeff\uff01-\uff03\uff05-\uff07\uff0a\uff0c\uff0e\uff0f\uff1a\uff1b\uff1f\uff20\uff3c\uff61\uff64\uff65]+/g, "").toLowerCase());
- }
-
- // node_modules/osm-community-index/lib/resolve_strings.js
- function resolveStrings(item, defaults2, localizerFn) {
- let itemStrings = Object.assign({}, item.strings);
- let defaultStrings = Object.assign({}, defaults2[item.type]);
- const anyToken = new RegExp(/(\{\w+\})/, "gi");
- if (localizerFn) {
- if (itemStrings.community) {
- const communityID = simplify2(itemStrings.community);
- itemStrings.community = localizerFn(`_communities.${communityID}`);
- }
- ["name", "description", "extendedDescription"].forEach((prop) => {
- if (defaultStrings[prop])
- defaultStrings[prop] = localizerFn(`_defaults.${item.type}.${prop}`);
- if (itemStrings[prop])
- itemStrings[prop] = localizerFn(`${item.id}.${prop}`);
+ // 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);
}
- let replacements = {
- account: item.account,
- community: itemStrings.community,
- signupUrl: itemStrings.signupUrl,
- url: itemStrings.url
- };
- if (!replacements.signupUrl) {
- replacements.signupUrl = resolve(itemStrings.signupUrl || defaultStrings.signupUrl);
- }
- if (!replacements.url) {
- replacements.url = resolve(itemStrings.url || defaultStrings.url);
- }
- let resolved = {
- name: resolve(itemStrings.name || defaultStrings.name),
- url: resolve(itemStrings.url || defaultStrings.url),
- signupUrl: resolve(itemStrings.signupUrl || defaultStrings.signupUrl),
- description: resolve(itemStrings.description || defaultStrings.description),
- extendedDescription: resolve(itemStrings.extendedDescription || defaultStrings.extendedDescription)
- };
- resolved.nameHTML = linkify(resolved.url, resolved.name);
- resolved.urlHTML = linkify(resolved.url);
- resolved.signupUrlHTML = linkify(resolved.signupUrl);
- resolved.descriptionHTML = resolve(itemStrings.description || defaultStrings.description, true);
- resolved.extendedDescriptionHTML = resolve(itemStrings.extendedDescription || defaultStrings.extendedDescription, true);
- return resolved;
- function resolve(s, addLinks) {
- if (!s)
- return void 0;
- let result = s;
- for (let key in replacements) {
- const token = `{${key}}`;
- const regex = new RegExp(token, "g");
- if (regex.test(result)) {
- let replacement = replacements[key];
- if (!replacement) {
- throw new Error(`Cannot resolve token: ${token}`);
- } else {
- if (addLinks && (key === "signupUrl" || key === "url")) {
- replacement = linkify(replacement);
- }
- result = result.replace(regex, replacement);
- }
- }
+ 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")
+ );
}
- const leftovers = result.match(anyToken);
- if (leftovers) {
- throw new Error(`Cannot resolve tokens: ${leftovers}`);
+ 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();
}
- if (addLinks && item.type === "reddit") {
- result = result.replace(/(\/r\/\w+\/*)/i, (match) => linkify(resolved.url, match));
+ 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 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;
}
- return result;
+ degNum = Math.round(degNum * 10) / 10;
+ degStr = degNum.toString();
+ input.property("value", degStr);
+ corePreferences("validate-square-degrees", degStr);
+ context.validator().revalidateUnsquare();
}
- function linkify(url, text2) {
- if (!url)
- return void 0;
- text2 = text2 || url;
- return `${text2}`;
+ 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/ui/success.js
- var _oci = null;
- function uiSuccess(context) {
- const MAXEVENTS = 2;
- const dispatch10 = dispatch_default("cancel");
- let _changeset2;
- let _location;
- ensureOSMCommunityIndex();
- function ensureOSMCommunityIndex() {
- const data = _mainFileFetcher;
- return Promise.all([
- data.get("oci_features"),
- data.get("oci_resources"),
- data.get("oci_defaults")
- ]).then((vals) => {
- if (_oci)
- return _oci;
- if (vals[0] && Array.isArray(vals[0].features)) {
- _mainLocations.mergeCustomGeoJSON(vals[0]);
- }
- let ociResources = Object.values(vals[1].resources);
- if (ociResources.length) {
- return _mainLocations.mergeLocationSets(ociResources).then(() => {
- _oci = {
- resources: ociResources,
- defaults: vals[2].defaults
- };
- return _oci;
- });
- } else {
- _oci = {
- resources: [],
- defaults: vals[2].defaults
- };
- return _oci;
- }
- });
+ // 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 parseEventDate(when) {
- if (!when)
- return;
- let raw = when.trim();
- if (!raw)
- return;
- if (!/Z$/.test(raw)) {
- raw += "Z";
- }
- const parsed = new Date(raw);
- return new Date(parsed.toUTCString().substr(0, 25));
+ 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 success(selection2) {
- let header = selection2.append("div").attr("class", "header fillL");
- header.append("h2").call(_t.append("success.just_edited"));
- header.append("button").attr("class", "close").attr("title", _t("icons.close")).on("click", () => dispatch10.call("cancel")).call(svgIcon("#iD-icon-close"));
- let body = selection2.append("div").attr("class", "body save-success fillL");
- let summary = body.append("div").attr("class", "save-summary");
- summary.append("h3").call(_t.append("success.thank_you" + (_location ? "_location" : ""), { where: _location }));
- summary.append("p").call(_t.append("success.help_html")).append("a").attr("class", "link-out").attr("target", "_blank").attr("href", _t("success.help_link_url")).call(svgIcon("#iD-icon-out-link", "inline")).append("span").call(_t.append("success.help_link_text"));
- let osm = context.connection();
- if (!osm)
- return;
- let changesetURL = osm.changesetURL(_changeset2.id);
- let table = summary.append("table").attr("class", "summary-table");
- let row = table.append("tr").attr("class", "summary-row");
- row.append("td").attr("class", "cell-icon summary-icon").append("a").attr("target", "_blank").attr("href", changesetURL).append("svg").attr("class", "logo-small").append("use").attr("xlink:href", "#iD-logo-osm");
- let summaryDetail = row.append("td").attr("class", "cell-detail summary-detail");
- summaryDetail.append("a").attr("class", "cell-detail summary-view-on-osm").attr("target", "_blank").attr("href", changesetURL).call(_t.append("success.view_on_osm"));
- summaryDetail.append("div").html(_t.html("success.changeset_id", {
- changeset_id: { html: `${_changeset2.id}` }
- }));
- ensureOSMCommunityIndex().then((oci) => {
- const loc = context.map().center();
- const validLocations = _mainLocations.locationsAt(loc);
- let communities = [];
- oci.resources.forEach((resource) => {
- let area = validLocations[resource.locationSetID];
- if (!area)
- return;
- const localizer = (stringID) => _t.html(`community.${stringID}`);
- resource.resolved = resolveStrings(resource, oci.defaults, localizer);
- communities.push({
- area,
- order: resource.order || 0,
- resource
- });
- });
- communities.sort((a, b) => a.area - b.area || b.order - a.order);
- body.call(showCommunityLinks, communities.map((c) => c.resource));
+ 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 showCommunityLinks(selection2, resources) {
- let communityLinks = selection2.append("div").attr("class", "save-communityLinks");
- communityLinks.append("h3").call(_t.append("success.like_osm"));
- let table = communityLinks.append("table").attr("class", "community-table");
- let row = table.selectAll(".community-row").data(resources);
- let rowEnter = row.enter().append("tr").attr("class", "community-row");
- rowEnter.append("td").attr("class", "cell-icon community-icon").append("a").attr("target", "_blank").attr("href", (d) => d.resolved.url).append("svg").attr("class", "logo-small").append("use").attr("xlink:href", (d) => `#community-${d.type}`);
- let communityDetail = rowEnter.append("td").attr("class", "cell-detail community-detail");
- communityDetail.each(showCommunityDetails);
- communityLinks.append("div").attr("class", "community-missing").call(_t.append("success.missing")).append("a").attr("class", "link-out").attr("target", "_blank").call(svgIcon("#iD-icon-out-link", "inline")).attr("href", "https://github.com/osmlab/osm-community-index/issues").append("span").call(_t.append("success.tell_us"));
- }
- function showCommunityDetails(d) {
- let selection2 = select_default2(this);
- let communityID = d.id;
- selection2.append("div").attr("class", "community-name").html(d.resolved.nameHTML);
- selection2.append("div").attr("class", "community-description").html(d.resolved.descriptionHTML);
- if (d.resolved.extendedDescriptionHTML || d.languageCodes && d.languageCodes.length) {
- selection2.append("div").call(uiDisclosure(context, `community-more-${d.id}`, false).expanded(false).updatePreference(false).label(_t.html("success.more")).content(showMore));
- }
- let nextEvents = (d.events || []).map((event) => {
- event.date = parseEventDate(event.when);
- return event;
- }).filter((event) => {
- const t = event.date.getTime();
- const now3 = new Date().setHours(0, 0, 0, 0);
- return !isNaN(t) && t >= now3;
- }).sort((a, b) => {
- return a.date < b.date ? -1 : a.date > b.date ? 1 : 0;
- }).slice(0, MAXEVENTS);
- if (nextEvents.length) {
- selection2.append("div").call(uiDisclosure(context, `community-events-${d.id}`, false).expanded(false).updatePreference(false).label(_t.html("success.events")).content(showNextEvents)).select(".hide-toggle").append("span").attr("class", "badge-text").text(nextEvents.length);
- }
- function showMore(selection3) {
- let more = selection3.selectAll(".community-more").data([0]);
- let moreEnter = more.enter().append("div").attr("class", "community-more");
- if (d.resolved.extendedDescriptionHTML) {
- moreEnter.append("div").attr("class", "community-extended-description").html(d.resolved.extendedDescriptionHTML);
- }
- if (d.languageCodes && d.languageCodes.length) {
- const languageList = d.languageCodes.map((code) => _mainLocalizer.languageName(code)).join(", ");
- moreEnter.append("div").attr("class", "community-languages").call(_t.append("success.languages", { languages: languageList }));
+ 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"));
}
- function showNextEvents(selection3) {
- let events = selection3.append("div").attr("class", "community-events");
- let item = events.selectAll(".community-event").data(nextEvents);
- let itemEnter = item.enter().append("div").attr("class", "community-event");
- itemEnter.append("div").attr("class", "community-event-name").append("a").attr("target", "_blank").attr("href", (d2) => d2.url).text((d2) => {
- let name2 = d2.name;
- if (d2.i18n && d2.id) {
- name2 = _t(`community.${communityID}.events.${d2.id}.name`, { default: name2 });
- }
- return name2;
+ 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" }
});
- itemEnter.append("div").attr("class", "community-event-when").text((d2) => {
- let options2 = { weekday: "short", day: "numeric", month: "short", year: "numeric" };
- if (d2.date.getHours() || d2.date.getMinutes()) {
- options2.hour = "numeric";
- options2.minute = "numeric";
- }
- return d2.date.toLocaleString(_mainLocalizer.localeCode(), options2);
+ } 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" }
});
- itemEnter.append("div").attr("class", "community-event-where").text((d2) => {
- let where = d2.where;
- if (d2.i18n && d2.id) {
- where = _t(`community.${communityID}.events.${d2.id}.where`, { default: where });
- }
- return where;
+ } 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" }
});
- itemEnter.append("div").attr("class", "community-event-description").text((d2) => {
- let description2 = d2.description;
- if (d2.i18n && d2.id) {
- description2 = _t(`community.${communityID}.events.${d2.id}.description`, { default: description2 });
- }
- return description2;
+ } 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" }
});
}
+ 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));
}
- success.changeset = function(val) {
- if (!arguments.length)
- return _changeset2;
- _changeset2 = val;
- return success;
- };
- success.location = function(val) {
- if (!arguments.length)
- return _location;
- _location = val;
- return success;
- };
- return utilRebind(success, dispatch10, "on");
+ 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/ui/version.js
- var sawVersion = null;
- var isNewVersion = false;
- var isNewUser = false;
- function uiVersion(context) {
- var currVersion = context.version;
- var matchedVersion = currVersion.match(/\d+\.\d+\.\d+.*/);
- if (sawVersion === null && matchedVersion !== null) {
- if (corePreferences("sawVersion")) {
- isNewUser = false;
- isNewVersion = corePreferences("sawVersion") !== currVersion && currVersion.indexOf("-") === -1;
- } else {
- isNewUser = true;
- isNewVersion = true;
+ // 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;
}
- corePreferences("sawVersion", currVersion);
- sawVersion = currVersion;
- }
- return function(selection2) {
- selection2.append("a").attr("target", "_blank").attr("href", "https://github.com/openstreetmap/iD").text(currVersion);
- if (isNewVersion && !isNewUser) {
- selection2.append("a").attr("class", "badge").attr("target", "_blank").attr("href", "https://github.com/openstreetmap/iD/blob/release/CHANGELOG.md#whats-new").call(svgIcon("#maki-gift-11")).call(uiTooltip().title(_t.html("version.whats_new", { version: currVersion })).placement("top").scrollContainer(context.container().select(".main-footer-wrap")));
+ 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;
+ }
+ if (_currSettings.fileList) {
+ _currSettings.url = "";
+ }
+ corePreferences("settings-custom-data-url", _currSettings.url);
+ this.blur();
+ modal.close();
+ dispatch14.call("change", this, _currSettings);
+ }
+ }
+ return utilRebind(render, dispatch14, "on");
}
- // modules/ui/zoom.js
- function uiZoom(context) {
- var zooms = [{
- id: "zoom-in",
- icon: "iD-icon-plus",
- title: _t.html("zoom.in"),
- action: zoomIn,
- disabled: function() {
- return !context.map().canZoomIn();
- },
- disabledTitle: _t.html("zoom.disabled.in"),
- key: "+"
- }, {
- id: "zoom-out",
- icon: "iD-icon-minus",
- title: _t.html("zoom.out"),
- action: zoomOut,
- disabled: function() {
- return !context.map().canZoomOut();
- },
- disabledTitle: _t.html("zoom.disabled.out"),
- key: "-"
- }];
- function zoomIn(d3_event) {
- if (d3_event.shiftKey)
- return;
- d3_event.preventDefault();
- context.map().zoomIn();
+ // 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 zoomOut(d3_event) {
- if (d3_event.shiftKey)
- return;
- d3_event.preventDefault();
- context.map().zoomOut();
+ function showsLayer(which) {
+ var layer = layers.layer(which);
+ if (layer) {
+ return layer.enabled();
+ }
+ return false;
}
- function zoomInFurther(d3_event) {
- if (d3_event.shiftKey)
- return;
- d3_event.preventDefault();
- context.map().zoomInFurther();
+ 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 zoomOutFurther(d3_event) {
- if (d3_event.shiftKey)
- return;
- d3_event.preventDefault();
- context.map().zoomOutFurther();
+ function toggleLayer(which) {
+ setLayer(which, !showsLayer(which));
}
- return function(selection2) {
- var tooltipBehavior = uiTooltip().placement(_mainLocalizer.textDirection() === "rtl" ? "right" : "left").title(function(d) {
- if (d.disabled()) {
- return d.disabledTitle;
- }
- return d.title;
- }).keys(function(d) {
- return [d.key];
+ function drawOsmItems(selection2) {
+ var osmKeys = ["osm", "notes"];
+ var osmLayers = layers.all().filter(function(obj) {
+ return osmKeys.indexOf(obj.id) !== -1;
});
- var lastPointerUpType;
- var buttons = selection2.selectAll("button").data(zooms).enter().append("button").attr("class", function(d) {
- return d.id;
- }).on("pointerup.editor", function(d3_event) {
- lastPointerUpType = d3_event.pointerType;
- }).on("click.editor", function(d3_event, d) {
- if (!d.disabled()) {
- d.action(d3_event);
- } else if (lastPointerUpType === "touch" || lastPointerUpType === "pen") {
- context.ui().flash.duration(2e3).iconName("#" + d.icon).iconClass("disabled").label(d.disabledTitle)();
+ 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")
+ );
}
- lastPointerUpType = null;
- }).call(tooltipBehavior);
- buttons.each(function(d) {
- select_default2(this).call(svgIcon("#" + d.icon, "light"));
- });
- utilKeybinding.plusKeys.forEach(function(key) {
- context.keybinding().on([key], zoomIn);
- context.keybinding().on([uiCmd("\u2325" + key)], zoomInFurther);
});
- utilKeybinding.minusKeys.forEach(function(key) {
- context.keybinding().on([key], zoomOut);
- context.keybinding().on([uiCmd("\u2325" + key)], zoomOutFurther);
+ labelEnter.append("input").attr("type", "checkbox").on("change", function(d3_event, d2) {
+ toggleLayer(d2.id);
});
- function updateButtonStates() {
- buttons.classed("disabled", function(d) {
- return d.disabled();
- }).each(function() {
- var selection3 = select_default2(this);
- if (!selection3.select(".tooltip.in").empty()) {
- selection3.call(tooltipBehavior.updateContent);
- }
- });
- }
- updateButtonStates();
- context.map().on("move.uiZoom", updateButtonStates);
- };
- }
-
- // modules/ui/sections/raw_tag_editor.js
- function uiSectionRawTagEditor(id2, context) {
- var section = uiSection(id2, context).classes("raw-tag-editor").label(function() {
- var count = Object.keys(_tags).filter(function(d) {
- return d;
- }).length;
- return _t.html("inspector.title_count", { title: { html: _t.html("inspector.tags") }, count });
- }).expandedByDefault(false).disclosureContent(renderDisclosureContent);
- var taginfo = services.taginfo;
- var dispatch10 = dispatch_default("change");
- var availableViews = [
- { id: "list", icon: "#fas-th-list" },
- { id: "text", icon: "#fas-i-cursor" }
- ];
- var _tagView = corePreferences("raw-tag-editor-view") || "list";
- var _readOnlyTags = [];
- var _orderedKeys = [];
- var _showBlank = false;
- var _pendingChange = null;
- var _state;
- var _presets;
- var _tags;
- var _entityIDs;
- var _didInteract = false;
- function interacted() {
- _didInteract = true;
- }
- function renderDisclosureContent(wrap2) {
- _orderedKeys = _orderedKeys.filter(function(key) {
- return _tags[key] !== void 0;
+ labelEnter.append("span").html(function(d2) {
+ return _t.html("map_data.layers." + d2.id + ".title");
});
- var all = Object.keys(_tags).sort();
- var missingKeys = utilArrayDifference(all, _orderedKeys);
- for (var i2 in missingKeys) {
- _orderedKeys.push(missingKeys[i2]);
- }
- var rowData = _orderedKeys.map(function(key, i3) {
- return { index: i3, key, value: _tags[key] };
+ li.merge(liEnter).classed("active", function(d2) {
+ return d2.layer.enabled();
+ }).selectAll("input").property("checked", function(d2) {
+ return d2.layer.enabled();
});
- if (!rowData.length || _showBlank) {
- _showBlank = false;
- rowData.push({ index: rowData.length, key: "", value: "" });
- }
- var options2 = wrap2.selectAll(".raw-tag-options").data([0]);
- options2.exit().remove();
- var optionsEnter = options2.enter().insert("div", ":first-child").attr("class", "raw-tag-options").attr("role", "tablist");
- var optionEnter = optionsEnter.selectAll(".raw-tag-option").data(availableViews, function(d) {
- return d.id;
- }).enter();
- optionEnter.append("button").attr("class", function(d) {
- return "raw-tag-option raw-tag-option-" + d.id + (_tagView === d.id ? " selected" : "");
- }).attr("aria-selected", function(d) {
- return _tagView === d.id;
- }).attr("role", "tab").attr("title", function(d) {
- return _t("icons." + d.id);
- }).on("click", function(d3_event, d) {
- _tagView = d.id;
- corePreferences("raw-tag-editor-view", d.id);
- wrap2.selectAll(".raw-tag-option").classed("selected", function(datum2) {
- return datum2 === d;
- }).attr("aria-selected", function(datum2) {
- return datum2 === d;
- });
- wrap2.selectAll(".tag-text").classed("hide", d.id !== "text").each(setTextareaHeight);
- wrap2.selectAll(".tag-list, .add-row").classed("hide", d.id !== "list");
- }).each(function(d) {
- select_default2(this).call(svgIcon(d.icon));
+ }
+ function drawQAItems(selection2) {
+ var qaKeys = ["keepRight", "osmose"];
+ var qaLayers = layers.all().filter(function(obj) {
+ return qaKeys.indexOf(obj.id) !== -1;
});
- var textData = rowsToText(rowData);
- var textarea = wrap2.selectAll(".tag-text").data([0]);
- textarea = textarea.enter().append("textarea").attr("class", "tag-text" + (_tagView !== "text" ? " hide" : "")).call(utilNoAuto).attr("placeholder", _t("inspector.key_value")).attr("spellcheck", "false").merge(textarea);
- textarea.call(utilGetSetValue, textData).each(setTextareaHeight).on("input", setTextareaHeight).on("focus", interacted).on("blur", textChanged).on("change", textChanged);
- var list = wrap2.selectAll(".tag-list").data([0]);
- list = list.enter().append("ul").attr("class", "tag-list" + (_tagView !== "list" ? " hide" : "")).merge(list);
- var addRowEnter = wrap2.selectAll(".add-row").data([0]).enter().append("div").attr("class", "add-row" + (_tagView !== "list" ? " hide" : ""));
- addRowEnter.append("button").attr("class", "add-tag").attr("aria-label", _t("inspector.add_to_tag")).call(svgIcon("#iD-icon-plus", "light")).call(uiTooltip().title(_t.html("inspector.add_to_tag")).placement(_mainLocalizer.textDirection() === "ltr" ? "right" : "left")).on("click", addTag);
- addRowEnter.append("div").attr("class", "space-value");
- addRowEnter.append("div").attr("class", "space-buttons");
- var items = list.selectAll(".tag-row").data(rowData, function(d) {
- return d.key;
+ 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;
});
- items.exit().each(unbind).remove();
- var itemsEnter = items.enter().append("li").attr("class", "tag-row").classed("readonly", isReadOnly);
- var innerWrap = itemsEnter.append("div").attr("class", "inner-wrap");
- innerWrap.append("div").attr("class", "key-wrap").append("input").property("type", "text").attr("class", "key").call(utilNoAuto).on("focus", interacted).on("blur", keyChange).on("change", keyChange);
- innerWrap.append("div").attr("class", "value-wrap").append("input").property("type", "text").attr("class", "value").call(utilNoAuto).on("focus", interacted).on("blur", valueChange).on("change", valueChange).on("keydown.push-more", pushMore);
- innerWrap.append("button").attr("class", "form-field-button remove").attr("title", _t("icons.remove")).call(svgIcon("#iD-operation-delete"));
- items = items.merge(itemsEnter).sort(function(a, b) {
- return a.index - b.index;
+ var labelEnter = liEnter.append("label").each(function(d2) {
+ select_default2(this).call(
+ uiTooltip().title(() => _t.append("map_data.layers." + d2.id + ".tooltip")).placement("bottom")
+ );
});
- items.each(function(d) {
- var row = select_default2(this);
- var key = row.select("input.key");
- var value = row.select("input.value");
- if (_entityIDs && taginfo && _state !== "hover") {
- bindTypeahead(key, value);
- }
- var referenceOptions = { key: d.key };
- if (typeof d.value === "string") {
- referenceOptions.value = d.value;
- }
- var reference = uiTagReference(referenceOptions, context);
- if (_state === "hover") {
- reference.showing(false);
+ 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 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"
}
- row.select(".inner-wrap").call(reference.button);
- row.call(reference.body);
- row.select("button.remove");
+ ];
+ 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;
});
- items.selectAll("input.key").attr("title", function(d) {
- return d.key;
- }).call(utilGetSetValue, function(d) {
- return d.key;
- }).attr("readonly", function(d) {
- return isReadOnly(d) || null;
- });
- items.selectAll("input.value").attr("title", function(d) {
- return Array.isArray(d.value) ? d.value.filter(Boolean).join("\n") : d.value;
- }).classed("mixed", function(d) {
- return Array.isArray(d.value);
- }).attr("placeholder", function(d) {
- return typeof d.value === "string" ? null : _t("inspector.multiple_values");
- }).call(utilGetSetValue, function(d) {
- return typeof d.value === "string" ? d.value : "";
- }).attr("readonly", function(d) {
- return isReadOnly(d) || null;
- });
- items.selectAll("button.remove").on(("PointerEvent" in window ? "pointer" : "mouse") + "down", removeTag);
- }
- function isReadOnly(d) {
- for (var i2 = 0; i2 < _readOnlyTags.length; i2++) {
- if (d.key.match(_readOnlyTags[i2]) !== null) {
- return true;
+ var labelEnter = liEnter.append("label").each(function(d2) {
+ select_default2(this).call(
+ uiTooltip().title(d2.tooltip).placement("top")
+ );
+ });
+ 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);
}
}
- return false;
- }
- function setTextareaHeight() {
- if (_tagView !== "text")
- return;
- var selection2 = select_default2(this);
- var matches = selection2.node().value.match(/\n/g);
- var lineCount = 2 + Number(matches && matches.length);
- var lineHeight = 20;
- selection2.style("height", lineCount * lineHeight + "px");
}
- function stringify3(s) {
- return JSON.stringify(s).slice(1, -1);
+ 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");
+ });
+ 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 unstringify(s) {
- var leading = "";
- var trailing = "";
- if (s.length < 1 || s.charAt(0) !== '"') {
- leading = '"';
- }
- if (s.length < 2 || s.charAt(s.length - 1) !== '"' || s.charAt(s.length - 1) === '"' && s.charAt(s.length - 2) === "\\") {
- trailing = '"';
- }
- return JSON.parse(leading + s + trailing);
+ function editCustom() {
+ context.container().call(settingsCustomData);
}
- function rowsToText(rows) {
- var str2 = rows.filter(function(row) {
- return row.key && row.key.trim() !== "";
- }).map(function(row) {
- var rawVal = row.value;
- if (typeof rawVal !== "string")
- rawVal = "*";
- var val = rawVal ? stringify3(rawVal) : "";
- return stringify3(row.key) + "=" + val;
- }).join("\n");
- if (_state !== "hover" && str2.length) {
- return str2 + "\n";
+ 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);
}
- return str2;
}
- function textChanged() {
- var newText = this.value.trim();
- var newTags = {};
- newText.split("\n").forEach(function(row) {
- var m = row.match(/^\s*([^=]+)=(.*)$/);
- if (m !== null) {
- var k = context.cleanTagKey(unstringify(m[1].trim()));
- var v = context.cleanTagValue(unstringify(m[2].trim()));
- newTags[k] = v;
- }
+ 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");
});
- var tagDiff = utilTagDiff(_tags, newTags);
- if (!tagDiff.length)
- return;
- _pendingChange = _pendingChange || {};
- tagDiff.forEach(function(change) {
- if (isReadOnly({ key: change.key }))
- return;
- if (change.newVal === "*" && typeof change.oldVal !== "string")
- return;
- if (change.type === "-") {
- _pendingChange[change.key] = void 0;
- } else if (change.type === "+") {
- _pendingChange[change.key] = change.newVal || "";
- }
+ 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");
});
- if (Object.keys(_pendingChange).length === 0) {
- _pendingChange = null;
- return;
- }
- scheduleChange();
+ measurementPanelLabelEnter.append("span").call(_t.append("map_data.measurement_panel.title"));
}
- function pushMore(d3_event) {
- if (d3_event.keyCode === 9 && !d3_event.shiftKey && section.selection().selectAll(".tag-list li:last-child input.value").node() === this && utilGetSetValue(select_default2(this))) {
- addTag();
- }
+ context.layers().on("change.uiSectionDataLayers", section.reRender);
+ context.map().on(
+ "move.uiSectionDataLayers",
+ debounce_default(function() {
+ window.requestIdleCallback(section.reRender);
+ }, 1e3)
+ );
+ return section;
+ }
+
+ // 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);
}
- function bindTypeahead(key, value) {
- if (isReadOnly(key.datum()))
- return;
- if (Array.isArray(value.datum().value)) {
- value.call(uiCombobox(context, "tag-value").minItems(1).fetcher(function(value2, callback) {
- var keyString = utilGetSetValue(key);
- if (!_tags[keyString])
- return;
- var data = _tags[keyString].filter(Boolean).map(function(tagValue) {
- return {
- value: tagValue,
- title: tagValue
+ 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);
};
- });
- callback(data);
- }));
- return;
- }
- var geometry = context.graph().geometry(_entityIDs[0]);
- key.call(uiCombobox(context, "tag-key").fetcher(function(value2, callback) {
- taginfo.keys({
- debounce: true,
- geometry,
- query: value2
- }, function(err, data) {
- if (!err) {
- var filtered = data.filter(function(d) {
- return _tags[d.value] === void 0;
- });
- callback(sort(value2, filtered));
- }
- });
- }));
- value.call(uiCombobox(context, "tag-value").fetcher(function(value2, callback) {
- taginfo.values({
- debounce: true,
- key: utilGetSetValue(key),
- geometry,
- query: value2
- }, function(err, data) {
- if (!err)
- callback(sort(value2, data));
- });
- }));
- function sort(value2, data) {
- var sameletter = [];
- var other = [];
- for (var i2 = 0; i2 < data.length; i2++) {
- if (data[i2].value.substring(0, value2.length) === value2) {
- sameletter.push(data[i2]);
- } else {
- other.push(data[i2]);
}
- }
- return sameletter.concat(other);
- }
+ 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 unbind() {
- var row = select_default2(this);
- row.selectAll("input.key").call(uiCombobox.off, context);
- row.selectAll("input.value").call(uiCombobox.off, context);
+ function autoHiddenFeature(d2) {
+ return context.features().autoHidden(d2);
}
- function keyChange(d3_event, d) {
- if (select_default2(this).attr("readonly"))
- return;
- var kOld = d.key;
- if (_pendingChange && _pendingChange.hasOwnProperty(kOld) && _pendingChange[kOld] === void 0)
- return;
- var kNew = context.cleanTagKey(this.value.trim());
- if (isReadOnly({ key: kNew })) {
- this.value = kOld;
- return;
- }
- if (kNew && kNew !== kOld && _tags[kNew] !== void 0) {
- this.value = kOld;
- section.selection().selectAll(".tag-list input.value").each(function(d2) {
- if (d2.key === kNew) {
- var input = select_default2(this).node();
- input.focus();
- input.select();
- }
- });
- return;
- }
- _pendingChange = _pendingChange || {};
- if (kOld) {
- if (kOld === kNew)
- return;
- _pendingChange[kNew] = _pendingChange[kOld] || { oldKey: kOld };
- _pendingChange[kOld] = void 0;
- } else {
- let row = this.parentNode.parentNode;
- let inputVal = select_default2(row).selectAll("input.value");
- let vNew = context.cleanTagValue(utilGetSetValue(inputVal));
- _pendingChange[kNew] = vNew;
- utilGetSetValue(inputVal, vNew);
- }
- var existingKeyIndex = _orderedKeys.indexOf(kOld);
- if (existingKeyIndex !== -1)
- _orderedKeys[existingKeyIndex] = kNew;
- d.key = kNew;
- this.value = kNew;
- scheduleChange();
+ function showsFeature(d2) {
+ return context.features().enabled(d2);
}
- function valueChange(d3_event, d) {
- if (isReadOnly(d))
- return;
- if (typeof d.value !== "string" && !this.value)
- return;
- if (_pendingChange && _pendingChange.hasOwnProperty(d.key) && _pendingChange[d.key] === void 0)
- return;
- _pendingChange = _pendingChange || {};
- _pendingChange[d.key] = context.cleanTagValue(this.value);
- scheduleChange();
+ function clickFeature(d3_event, d2) {
+ context.features().toggle(d2);
}
- function removeTag(d3_event, d) {
- if (isReadOnly(d))
- return;
- if (d.key === "") {
- _showBlank = false;
- section.reRender();
- } else {
- _orderedKeys = _orderedKeys.filter(function(key) {
- return key !== d.key;
- });
- _pendingChange = _pendingChange || {};
- _pendingChange[d.key] = void 0;
- scheduleChange();
- }
+ function showsLayer(id2) {
+ var layer = context.layers().layer(id2);
+ return layer && layer.enabled();
}
- function addTag() {
- window.setTimeout(function() {
- _showBlank = true;
- section.reRender();
- section.selection().selectAll(".tag-list li:last-child input.key").node().focus();
- }, 20);
+ context.features().on("change.map_features", section.reRender);
+ return section;
+ }
+
+ // 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 scheduleChange() {
- var entityIDs = _entityIDs;
- window.setTimeout(function() {
- if (!_pendingChange)
- return;
- dispatch10.call("change", this, entityIDs, _pendingChange);
- _pendingChange = null;
- }, 10);
+ 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);
}
- section.state = function(val) {
- if (!arguments.length)
- return _state;
- if (_state !== val) {
- _orderedKeys = [];
- _state = val;
- }
- return section;
- };
- section.presets = function(val) {
- if (!arguments.length)
- return _presets;
- _presets = val;
- if (_presets && _presets.length && _presets[0].isFallback()) {
- section.disclosureExpanded(true);
- } else if (!_didInteract) {
- section.disclosureExpanded(null);
- }
- return section;
- };
- section.tags = function(val) {
- if (!arguments.length)
- return _tags;
- _tags = val;
- return section;
- };
- section.entityIDs = function(val) {
- if (!arguments.length)
- return _entityIDs;
- if (!_entityIDs || !val || !utilArrayIdentical(_entityIDs, val)) {
- _entityIDs = val;
- _orderedKeys = [];
- }
- return section;
- };
- section.readOnlyTags = function(val) {
- if (!arguments.length)
- return _readOnlyTags;
- _readOnlyTags = val;
- return section;
- };
- return utilRebind(section, dispatch10, "on");
+ function isActiveFill(d2) {
+ return context.map().activeAreaFill() === d2;
+ }
+ function toggleHighlightEdited(d3_event) {
+ d3_event.preventDefault();
+ context.map().toggleHighlightEdited();
+ }
+ function setFill(d3_event, d2) {
+ context.map().activeAreaFill(d2);
+ }
+ context.map().on("changeHighlighting.ui_style, changeAreaFill.ui_style", section.reRender);
+ return section;
}
- // modules/ui/data_editor.js
- function uiDataEditor(context) {
- var dataHeader = uiDataHeader();
- var rawTagEditor = uiSectionRawTagEditor("custom-data-tag-editor", context).expandedByDefault(true).readOnlyTags([/./]);
- var _datum;
- function dataEditor(selection2) {
- var header = selection2.selectAll(".header").data([0]);
- var headerEnter = header.enter().append("div").attr("class", "header fillL");
- headerEnter.append("button").attr("class", "close").attr("title", _t("icons.close")).on("click", function() {
- context.enter(modeBrowse(context));
- }).call(svgIcon("#iD-icon-close"));
- headerEnter.append("h2").call(_t.append("map_data.title"));
- var body = selection2.selectAll(".body").data([0]);
- body = body.enter().append("div").attr("class", "body").merge(body);
- var editor = body.selectAll(".data-editor").data([0]);
- editor.enter().append("div").attr("class", "modal-section data-editor").merge(editor).call(dataHeader.datum(_datum));
- var rte = body.selectAll(".raw-tag-editor").data([0]);
- rte.enter().append("div").attr("class", "raw-tag-editor data-editor").merge(rte).call(rawTagEditor.tags(_datum && _datum.properties || {}).state("hover").render).selectAll("textarea.tag-text").attr("readonly", true).classed("readonly", true);
+ // 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")));
}
- dataEditor.datum = function(val) {
- if (!arguments.length)
- return _datum;
- _datum = val;
- return this;
- };
- return dataEditor;
+ function updatePhotoList(container) {
+ var _a4;
+ 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((_a4 = photoLayer.getPhotos()) != null ? _a4 : [], (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/osmose_details.js
- function uiOsmoseDetails(context) {
- let _qaItem;
- function issueString(d, type3) {
- if (!d)
- return "";
- const s = services.osmose.getStrings(d.itemType);
- return type3 in s ? s[type3] : "";
+ // 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);
}
- function osmoseDetails(selection2) {
- const details = selection2.selectAll(".error-details").data(_qaItem ? [_qaItem] : [], (d) => `${d.id}-${d.status || 0}`);
- details.exit().remove();
- const detailsEnter = details.enter().append("div").attr("class", "error-details qa-details-container");
- if (issueString(_qaItem, "detail")) {
- const div = detailsEnter.append("div").attr("class", "qa-details-subsection");
- div.append("h4").call(_t.append("QA.keepRight.detail_description"));
- div.append("p").attr("class", "qa-details-description-text").html((d) => issueString(d, "detail")).selectAll("a").attr("rel", "noopener").attr("target", "_blank");
+ 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());
+ }
+ return true;
+ });
+ function layerSupported(d2) {
+ return d2.layer && d2.layer.supported();
}
- const detailsDiv = detailsEnter.append("div").attr("class", "qa-details-subsection");
- const elemsDiv = detailsEnter.append("div").attr("class", "qa-details-subsection");
- if (issueString(_qaItem, "fix")) {
- const div = detailsEnter.append("div").attr("class", "qa-details-subsection");
- div.append("h4").call(_t.append("QA.osmose.fix_title"));
- div.append("p").html((d) => issueString(d, "fix")).selectAll("a").attr("rel", "noopener").attr("target", "_blank");
+ function layerEnabled(d2) {
+ return layerSupported(d2) && d2.layer.enabled();
}
- if (issueString(_qaItem, "trap")) {
- const div = detailsEnter.append("div").attr("class", "qa-details-subsection");
- div.append("h4").call(_t.append("QA.osmose.trap_title"));
- div.append("p").html((d) => issueString(d, "trap")).selectAll("a").attr("rel", "noopener").attr("target", "_blank");
+ function layerRendered(d2) {
+ var _a4, _b3, _c2;
+ return (_c2 = (_b3 = (_a4 = d2.layer).rendered) == null ? void 0 : _b3.call(_a4, context.map().zoom())) != null ? _c2 : true;
}
- const thisItem = _qaItem;
- services.osmose.loadIssueDetail(_qaItem).then((d) => {
- if (!d.elems || d.elems.length === 0)
- return;
- if (context.selectedErrorID() !== thisItem.id && context.container().selectAll(`.qaItem.osmose.hover.itemId-${thisItem.id}`).empty())
- return;
- if (d.detail) {
- detailsDiv.append("h4").call(_t.append("QA.osmose.detail_title"));
- detailsDiv.append("p").html((d2) => d2.detail).selectAll("a").attr("rel", "noopener").attr("target", "_blank");
+ 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";
}
- elemsDiv.append("h4").call(_t.append("QA.osmose.elems_title"));
- elemsDiv.append("ul").selectAll("li").data(d.elems).enter().append("li").append("a").attr("href", "#").attr("class", "error_entity_link").text((d2) => d2).each(function() {
- const link2 = select_default2(this);
- const entityID = this.textContent;
- const entity = context.hasEntity(entityID);
- link2.on("mouseenter", () => {
- utilHighlightEntities([entityID], true, context);
- }).on("mouseleave", () => {
- utilHighlightEntities([entityID], false, context);
- }).on("click", (d3_event) => {
- d3_event.preventDefault();
- utilHighlightEntities([entityID], false, context);
- const osmlayer = context.layers().layer("osm");
- if (!osmlayer.enabled()) {
- osmlayer.enabled(true);
- }
- context.map().centerZoom(d.loc, 20);
- if (entity) {
- context.enter(modeSelect(context, [entityID]));
+ return classes;
+ });
+ 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 {
- context.loadEntity(entityID, (err, result) => {
- if (err)
- return;
- const entity2 = result.data.find((e) => e.id === entityID);
- if (entity2)
- context.enter(modeSelect(context, [entityID]));
- });
- }
- });
- if (entity) {
- let name2 = utilDisplayName(entity);
- if (!name2) {
- const preset = _mainPresetIndex.match(entity, context.graph());
- name2 = preset && !preset.isFallback() && preset.name();
- }
- if (name2) {
- this.innerText = name2;
+ return _t.append(titleID);
}
- }
+ }).placement("top")
+ );
+ });
+ labelEnter.append("input").attr("type", "checkbox").on("change", function(d3_event, d2) {
+ toggleLayer(d2.id);
+ });
+ 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");
+ });
+ li.merge(liEnter).classed("active", layerEnabled).selectAll("input").property("disabled", (d2) => !layerRendered(d2)).property("checked", layerEnabled);
+ }
+ function drawPhotoTypeItems(selection2) {
+ var data = context.photos().allPhotoTypes();
+ function typeEnabled(d2) {
+ return context.photos().showsPhotoType(d2);
+ }
+ 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;
+ });
+ var labelEnter = liEnter.append("label").each(function(d2) {
+ select_default2(this).call(
+ uiTooltip().title(() => _t.append("photo_overlays.photo_type." + d2 + ".tooltip")).placement("top")
+ );
+ });
+ labelEnter.append("input").attr("type", "checkbox").on("change", function(d3_event, d2) {
+ context.photos().togglePhotoType(d2);
+ });
+ labelEnter.append("span").html(function(d2) {
+ return _t.html("photo_overlays.photo_type." + d2 + ".title");
+ });
+ 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")
+ );
+ });
+ labelEnter.append("span").each(function(d2) {
+ _t.append("photo_overlays.date_filter." + d2 + ".title")(select_default2(this));
+ });
+ 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) || "");
});
- context.features().forceVisible(d.elems);
- context.map().pan([0, 0]);
- }).catch((err) => {
- console.log(err);
});
+ li = li.merge(liEnter).classed("active", filterEnabled);
}
- osmoseDetails.issue = function(val) {
- if (!arguments.length)
- return _qaItem;
- _qaItem = val;
- return osmoseDetails;
- };
- return osmoseDetails;
- }
-
- // modules/ui/osmose_header.js
- function uiOsmoseHeader() {
- let _qaItem;
- function issueTitle(d) {
- const unknown = _t("inspector.unknown");
- if (!d)
- return unknown;
- const s = services.osmose.getStrings(d.itemType);
- return "title" in s ? s.title : unknown;
+ function drawUsernameFilter(selection2) {
+ function filterEnabled() {
+ return context.photos().usernames();
+ }
+ 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;
+ }
}
- function osmoseHeader(selection2) {
- const header = selection2.selectAll(".qa-header").data(_qaItem ? [_qaItem] : [], (d) => `${d.id}-${d.status || 0}`);
- header.exit().remove();
- const headerEnter = header.enter().append("div").attr("class", "qa-header");
- const svgEnter = headerEnter.append("div").attr("class", "qa-header-icon").classed("new", (d) => d.id < 0).append("svg").attr("width", "20px").attr("height", "30px").attr("viewbox", "0 0 20 30").attr("class", (d) => `preset-icon-28 qaItem ${d.service} itemId-${d.id} itemType-${d.itemType}`);
- svgEnter.append("polygon").attr("fill", (d) => services.osmose.getColor(d.item)).attr("class", "qaItem-fill").attr("points", "16,3 4,3 1,6 1,17 4,20 7,20 10,27 13,20 16,20 19,17.033 19,6");
- svgEnter.append("use").attr("class", "icon-annotation").attr("width", "12px").attr("height", "12px").attr("transform", "translate(4, 5.5)").attr("xlink:href", (d) => d.icon ? "#" + d.icon : "");
- headerEnter.append("div").attr("class", "qa-header-label").text(issueTitle);
+ function toggleLayer(which) {
+ setLayer(which, !showsLayer(which));
}
- osmoseHeader.issue = function(val) {
- if (!arguments.length)
- return _qaItem;
- _qaItem = val;
- return osmoseHeader;
- };
- return osmoseHeader;
- }
-
- // modules/ui/view_on_osmose.js
- function uiViewOnOsmose() {
- let _qaItem;
- function viewOnOsmose(selection2) {
- let url;
- if (services.osmose && _qaItem instanceof QAItem) {
- url = services.osmose.itemURL(_qaItem);
+ function showsLayer(which) {
+ var layer = layers.layer(which);
+ if (layer) {
+ return layer.enabled();
}
- const link2 = selection2.selectAll(".view-on-osmose").data(url ? [url] : []);
- link2.exit().remove();
- const linkEnter = link2.enter().append("a").attr("class", "view-on-osmose").attr("target", "_blank").attr("rel", "noopener").attr("href", (d) => d).call(svgIcon("#iD-icon-out-link", "inline"));
- linkEnter.append("span").call(_t.append("inspector.view_on_osmose"));
+ return false;
}
- viewOnOsmose.what = function(val) {
- if (!arguments.length)
- return _qaItem;
- _qaItem = val;
- return viewOnOsmose;
- };
- return viewOnOsmose;
- }
-
- // modules/ui/osmose_editor.js
- function uiOsmoseEditor(context) {
- const dispatch10 = dispatch_default("change");
- const qaDetails = uiOsmoseDetails(context);
- const qaHeader = uiOsmoseHeader(context);
- let _qaItem;
- function osmoseEditor(selection2) {
- const header = selection2.selectAll(".header").data([0]);
- const headerEnter = header.enter().append("div").attr("class", "header fillL");
- headerEnter.append("button").attr("class", "close").attr("title", _t("icons.close")).on("click", () => context.enter(modeBrowse(context))).call(svgIcon("#iD-icon-close"));
- headerEnter.append("h2").call(_t.append("QA.osmose.title"));
- let body = selection2.selectAll(".body").data([0]);
- body = body.enter().append("div").attr("class", "body").merge(body);
- let editor = body.selectAll(".qa-editor").data([0]);
- editor.enter().append("div").attr("class", "modal-section qa-editor").merge(editor).call(qaHeader.issue(_qaItem)).call(qaDetails.issue(_qaItem)).call(osmoseSaveSection);
- const footer = selection2.selectAll(".footer").data([0]);
- footer.enter().append("div").attr("class", "footer").merge(footer).call(uiViewOnOsmose(context).what(_qaItem));
+ function setLayer(which, enabled) {
+ var layer = layers.layer(which);
+ if (layer) {
+ layer.enabled(enabled);
+ }
}
- function osmoseSaveSection(selection2) {
- const isSelected = _qaItem && _qaItem.id === context.selectedErrorID();
- const isShown = _qaItem && isSelected;
- let saveSection = selection2.selectAll(".qa-save").data(isShown ? [_qaItem] : [], (d) => `${d.id}-${d.status || 0}`);
- saveSection.exit().remove();
- const saveSectionEnter = saveSection.enter().append("div").attr("class", "qa-save save-section cf");
- saveSection = saveSectionEnter.merge(saveSection).call(qaSaveButtons);
+ 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();
+ editLocalPhotos();
+ }).call(svgIcon("#iD-icon-more"));
+ 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 qaSaveButtons(selection2) {
- const isSelected = _qaItem && _qaItem.id === context.selectedErrorID();
- let buttonSection = selection2.selectAll(".buttons").data(isSelected ? [_qaItem] : [], (d) => d.status + d.id);
- buttonSection.exit().remove();
- const buttonEnter = buttonSection.enter().append("div").attr("class", "buttons");
- buttonEnter.append("button").attr("class", "button close-button action");
- buttonEnter.append("button").attr("class", "button ignore-button action");
- buttonSection = buttonSection.merge(buttonEnter);
- buttonSection.select(".close-button").call(_t.append("QA.keepRight.close")).on("click.close", function(d3_event, d) {
- this.blur();
- const qaService = services.osmose;
- if (qaService) {
- d.newStatus = "done";
- qaService.postUpdate(d, (err, item) => dispatch10.call("change", item));
- }
- });
- 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 editLocalPhotos() {
+ context.container().call(settingsLocalPhotos);
}
- osmoseEditor.error = function(val) {
- if (!arguments.length)
- return _qaItem;
- _qaItem = val;
- return osmoseEditor;
- };
- return utilRebind(osmoseEditor, dispatch10, "on");
+ function localPhotosChanged(d2) {
+ var localPhotosLayer = layers.layer("local-photos");
+ localPhotosLayer.fileList(d2);
+ }
+ context.layers().on("change.uiSectionPhotoOverlays", section.reRender);
+ context.photos().on("change.uiSectionPhotoOverlays", section.reRender);
+ context.map().on(
+ "move.photo_overlays",
+ debounce_default(function() {
+ window.requestIdleCallback(section.reRender);
+ }, 1e3)
+ );
+ return section;
}
- // 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;
+ // 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/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;
+ var overMap;
+ 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