Skip to content

Commit

Permalink
Re: OpenHistoricalMap/issues#875, that fresh build of iD.
Browse files Browse the repository at this point in the history
  • Loading branch information
@erictheise
erictheise committed Oct 3, 2024
1 parent 5fe3582 commit c60ef3c
Show file tree
Hide file tree
Showing 2 changed files with 63 additions and 17 deletions.
78 changes: 62 additions & 16 deletions vendor/assets/iD/iD.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22901,12 +22901,15 @@
version: "2.29.0-dev",
description: "A friendly editor for OpenStreetMap",
main: "dist/iD.min.js",
repository: "github:openstreetmap/iD",
homepage: "https://github.com/openstreetmap/iD",
bugs: "https://github.com/openstreetmap/iD/issues",
repository: {
type: "git",
url: "git+https://github.com/OpenHistoricalMap/iD"
},
homepage: "https://github.com/OpenHistoricalMap/iD",
bugs: "https://github.com/OpenHistoricalMap/issues/issues",
keywords: [
"editor",
"openstreetmap"
"openhistoricalmap"
],
license: "ISC",
scripts: {
Expand Down Expand Up @@ -32735,25 +32738,29 @@
function presetField(fieldID, field, allFields) {
allFields = allFields || {};
let _this = Object.assign({}, field);
let localizerFieldID = fieldID;
if (field.baseKey && field.index) {
localizerFieldID = field.baseKey + "_multiple";
}
_this.id = fieldID;
_this.safeid = utilSafeClassName(fieldID);
_this.matchGeometry = (geom) => !_this.geometry || _this.geometry.indexOf(geom) !== -1;
_this.matchAllGeometry = (geometries) => {
return !_this.geometry || geometries.every((geom) => _this.geometry.indexOf(geom) !== -1);
};
_this.t = (scope, options2) => _t(_mainLocalizer.coalesceStringIds([
"custom_presets.fields.".concat(fieldID, ".").concat(scope),
"_tagging.presets.fields.".concat(fieldID, ".").concat(scope)
"custom_presets.fields.".concat(localizerFieldID, ".").concat(scope),
"_tagging.presets.fields.".concat(localizerFieldID, ".").concat(scope)
]), options2);
_this.t.html = (scope, options2) => _t.html(_mainLocalizer.coalesceStringIds([
"custom_presets.fields.".concat(fieldID, ".").concat(scope),
"_tagging.presets.fields.".concat(fieldID, ".").concat(scope)
"custom_presets.fields.".concat(localizerFieldID, ".").concat(scope),
"_tagging.presets.fields.".concat(localizerFieldID, ".").concat(scope)
]), options2);
_this.t.append = (scope, options2) => _t.append(_mainLocalizer.coalesceStringIds([
"custom_presets.fields.".concat(fieldID, ".").concat(scope),
"_tagging.presets.fields.".concat(fieldID, ".").concat(scope)
"custom_presets.fields.".concat(localizerFieldID, ".").concat(scope),
"_tagging.presets.fields.".concat(localizerFieldID, ".").concat(scope)
]), options2);
_this.hasTextForStringId = (scope) => _mainLocalizer.hasTextForStringId("custom_presets.fields.".concat(fieldID, ".").concat(scope)) || _mainLocalizer.hasTextForStringId("_tagging.presets.fields.".concat(fieldID, ".").concat(scope));
_this.hasTextForStringId = (scope) => _mainLocalizer.hasTextForStringId("custom_presets.fields.".concat(localizerFieldID, ".").concat(scope)) || _mainLocalizer.hasTextForStringId("_tagging.presets.fields.".concat(localizerFieldID, ".").concat(scope));
_this.resolveReference = (which) => {
const referenceRegex = /^\{(.*)\}$/;
const match = (field[which] || "").match(referenceRegex);
Expand All @@ -32766,8 +32773,8 @@
}
return _this;
};
_this.title = () => _this.overrideLabel || _this.resolveReference("label").t("label", { "default": fieldID });
_this.label = () => _this.overrideLabel ? (selection2) => selection2.text(_this.overrideLabel) : _this.resolveReference("label").t.append("label", { "default": fieldID });
_this.title = () => _this.overrideLabel || _this.resolveReference("label").t("label", { "default": fieldID, "index": field.index });
_this.label = () => _this.overrideLabel ? (selection2) => selection2.text(_this.overrideLabel) : _this.resolveReference("label").t.append("label", { "default": fieldID, "index": field.index });
_this.placeholder = () => _this.resolveReference("placeholder").t("placeholder", { "default": "" });
_this.originalTerms = (_this.terms || []).join();
_this.terms = () => _this.resolveReference("label").t("terms", { "default": _this.originalTerms }).toLowerCase().trim().split(/\s*,+\s*/);
Expand Down Expand Up @@ -33073,6 +33080,26 @@
fields.source.type = "source";
fields.source.source = false;
fields.source.keys = ["source", "source:url", "source:name", "source:date"];
for (let i3 = 1; i3 < 4; i3++) {
let id3 = "source:" + i3.toString();
let previousId = "source" + (i3 - 1 > 0 ? ":" + (i3 - 1).toString() : "");
fields[id3] = {
...fields.source,
key: id3,
keys: [id3, id3 + ":url", id3 + ":name", id3 + ":date"],
// baseKey and index will be used to create a localized label for this field
baseKey: "source",
index: i3,
prerequisiteTag: {
keys: [
previousId,
previousId + ":url",
previousId + ":name",
previousId + ":date"
]
}
};
}
}
fields.license = {
key: "license",
Expand Down Expand Up @@ -71532,7 +71559,7 @@
let _tags = {};
let _selection = select_default2(null);
let _pendingChange;
const mainKey = "source";
const mainKey = field.key;
const sourceHeader = mainKey + ":";
const possibleSourceSubkeys = [{ key: "name" }, { key: "url" }, { key: "date" }];
function scheduleChange() {
Expand Down Expand Up @@ -71589,6 +71616,11 @@
_tags = tags;
_selection.call(sources);
};
sources.focus = function() {
var node = _selection.selectAll("input").node();
if (node)
node.focus();
};
return utilRebind(sources, dispatch14, "on");
}

Expand Down Expand Up @@ -71831,6 +71863,9 @@
if (d2.type === "multiCombo") {
referenceKey = referenceKey.replace(/:$/, "");
}
if (d2.type === "source") {
referenceKey = referenceKey.split(":")[0];
}
var referenceOptions = d2.reference || {
key: referenceKey,
value: _tags[referenceKey]
Expand Down Expand Up @@ -71914,6 +71949,10 @@
prerequisiteTag) {
if (!entityIDs.every(function(entityID) {
var entity = context.graph().entity(entityID);
if (prerequisiteTag.keys) {
const inEntityTags = (e3) => e3 in entity.tags;
return prerequisiteTag.keys.some(inEntityTags);
}
if (prerequisiteTag.key) {
var value = entity.tags[prerequisiteTag.key];
if (!value)
Expand Down Expand Up @@ -73459,8 +73498,15 @@
_fieldsArr.push(uiField(context, field, _entityIDs));
}
});
let optionalCoreKeys = ["source:1", "source:2", "source:3"];
optionalCoreKeys.forEach((key) => {
let field = presetsManager.field(key);
if (field && !_fieldsArr.includes(field)) {
_fieldsArr.push(uiField(context, field, _entityIDs, { show: false }));
}
});
sharedFields.forEach(function(field) {
if (!coreKeys.includes(field.id) && field.matchAllGeometry(geometries)) {
if (!coreKeys.includes(field.id) && !optionalCoreKeys.includes(field.id) && field.matchAllGeometry(geometries)) {
_fieldsArr.push(
uiField(context, field, _entityIDs)
);
Expand All @@ -73477,7 +73523,7 @@
return field1.title().localeCompare(field2.title(), _mainLocalizer.localeCode());
});
additionalFields.forEach(function(field) {
if (sharedFields.indexOf(field) === -1 && !coreKeys.includes(field.id) && field.matchAllGeometry(geometries)) {
if (sharedFields.indexOf(field) === -1 && !coreKeys.includes(field.id) && !optionalCoreKeys.includes(field.id) && field.matchAllGeometry(geometries)) {
_fieldsArr.push(
uiField(context, field, _entityIDs, { show: false })
);
Expand Down
2 changes: 1 addition & 1 deletion vendor/assets/iD/iD/locales/en.min.json
View file

Large diffs are not rendered by default.

0 comments on commit c60ef3c

Please sign in to comment.