Skip to content

Commit

Permalink
Addresses the Firefox field width issue in OpenHistoricalMap/issues#714
Browse files Browse the repository at this point in the history
… by cherry picking Minh's upstream pull request, openstreetmap#10175, and regenerating dist assets.
  • Loading branch information
erictheise committed Mar 22, 2024
1 parent c88036c commit e0da5fe
Show file tree
Hide file tree
Showing 6 changed files with 77 additions and 10 deletions.
1 change: 1 addition & 0 deletions dist/iD.css
Original file line number Diff line number Diff line change
Expand Up @@ -5425,6 +5425,7 @@
.ideditor .form-field-input-roadheight input.roadheight-secondary-number,
.ideditor .form-field-input-roadspeed input.roadspeed-number {
flex-basis: 0;
width: 0;
}
.ideditor .form-field-input-roadheight input.roadheight-unit,
.ideditor .form-field-input-roadheight input.roadheight-secondary-unit {
Expand Down
66 changes: 66 additions & 0 deletions dist/iD.js
Original file line number Diff line number Diff line change
Expand Up @@ -15896,6 +15896,7 @@
osmSetPointTags: () => osmSetPointTags,
osmSetVertexTags: () => osmSetVertexTags,
osmTagSuggestingArea: () => osmTagSuggestingArea,
osmTimelessFeatureTagValues: () => osmTimelessFeatureTagValues,
osmTurn: () => osmTurn,
osmVertexTags: () => osmVertexTags,
osmWay: () => osmWay,
Expand Down Expand Up @@ -16161,6 +16162,7 @@
validationMismatchedDates: () => validationMismatchedDates,
validationMismatchedGeometry: () => validationMismatchedGeometry,
validationMissingRole: () => validationMissingRole,
validationMissingStartDate: () => validationMissingStartDate,
validationMissingTag: () => validationMissingTag,
validationOutdatedTags: () => validationOutdatedTags,
validationPrivateData: () => validationPrivateData,
Expand Down Expand Up @@ -16585,6 +16587,27 @@
}
return true;
}
var osmTimelessFeatureTagValues = {
wood: true,
wetland: true,
beach: true,
cave_entrance: true,
peak: true,
cliff: true,
coastline: true,
tree_row: true,
water: true,
scrub: true,
grassland: true,
heath: true,
bare_rock: true,
glacier: true,
stream: true,
river: true,
pond: true,
basin: true,
lake: true
};

// node_modules/d3-array/src/ascending.js
function ascending(a2, b2) {
Expand Down Expand Up @@ -46701,6 +46724,7 @@
validationMismatchedDates: () => validationMismatchedDates,
validationMismatchedGeometry: () => validationMismatchedGeometry,
validationMissingRole: () => validationMissingRole,
validationMissingStartDate: () => validationMissingStartDate,
validationMissingTag: () => validationMissingTag,
validationOutdatedTags: () => validationOutdatedTags,
validationPrivateData: () => validationPrivateData,
Expand Down Expand Up @@ -48342,6 +48366,48 @@
return validation;
}

// modules/validations/missing_start_date.js
function validationMissingStartDate(context) {
const type2 = "missing_start_date";
const validation = function checkMissingStartDate(entity, graph) {
if (entity.tags && (entity.tags.start_date || entity.tags["start_date:edtf"]))
return [];
if (Object.keys(entity.tags).length === 0)
return [];
if (entity.tags && (entity.tags.natural && osmTimelessFeatureTagValues[entity.tags.natural] || entity.tags.waterway && osmTimelessFeatureTagValues[entity.tags.waterway] || entity.tags.water && osmTimelessFeatureTagValues[entity.tags.water]))
return [];
var osm = context.connection();
var isUnloadedNode = entity.type === "node" && osm && !osm.isDataLoaded(entity.loc);
if (isUnloadedNode || // allow untagged nodes that are part of ways
entity.geometry(graph) === "vertex" || // allow untagged entities that are part of relations
entity.hasParentRelations(graph))
return [];
const entityID = entity.id;
function showReference(selection2) {
selection2.selectAll(".issue-reference").data([0]).enter().append("div").attr("class", "issue-reference").call(_t.append("issues.missing_start_date.reference"));
}
return [new validationIssue({
type: type2,
severity: "warning",
message: (context2) => {
const entity2 = context2.hasEntity(entityID);
return entity2 ? _t.append("issues.missing_start_date.feature.message", {
feature: utilDisplayLabel(entity2, context2.graph())
}) : "";
},
reference: showReference,
entityIds: [entityID],
dynamicFixes: () => {
return [
new validationIssueFix({ title: _t.append("issues.fix.add_start_date.title") })
];
}
})];
};
validation.type = type2;
return validation;
}

// modules/validations/invalid_format.js
function validationFormatting() {
var type2 = "invalid_format";
Expand Down
8 changes: 4 additions & 4 deletions dist/iD.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/iD.min.js

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions dist/iD.min.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/locales/en.min.json

Large diffs are not rendered by default.

0 comments on commit e0da5fe

Please sign in to comment.