CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-03-30 17:00:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix preset categories

Browse Source
This commit is contained in:
Quincy Morgan
2020-03-31 16:41:46 -07:00
parent c49deee86c
commit a950b193d1
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/presets/index.js
View File

@@ -102,6 +102,9 @@ export function presetIndex(context) {
});
}
// Need to rebuild _this.collection before loading categories
_this.collection = Object.values(_presets).concat(Object.values(_categories));
// Merge Categories
if (d.categories) {
Object.keys(d.categories).forEach(categoryID => {
@@ -114,13 +117,16 @@ export function presetIndex(context) {
});
}
// Rebuild _this.collection after loading categories
_this.collection = Object.values(_presets).concat(Object.values(_categories));
// Merge Defaults
if (d.defaults) {
Object.keys(d.defaults).forEach(geometry => {
const def = d.defaults[geometry];
if (Array.isArray(def)) { // add or replace
_defaults[geometry] = presetCollection(
def.map(presetID => _presets[presetID]).filter(Boolean)
def.map(id => _presets[id] || _categories[id]).filter(Boolean)
);
} else { // remove
delete _defaults[geometry];
@@ -134,9 +140,6 @@ export function presetIndex(context) {
// Reset all the preset fields - they'll need to be resolved again
Object.values(_presets).forEach(preset => preset.resetFields());
// Rebuild _this.collection
_this.collection = Object.values(_presets).concat(Object.values(_categories));
// Rebuild geometry index
_geometryIndex = { point: {}, vertex: {}, line: {}, area: {}, relation: {} };
_this.collection.forEach(preset => {