Skip to content

Commit

Permalink
Avoid stale "connect endpoints" fix for "tags imply area" that could …
Browse files Browse the repository at this point in the history
…cause invalid areas (close #6525)

Lower match score for man_made/bridge preset
  • Loading branch information
quincylvania committed Jun 12, 2019
1 parent aa7bf74 commit 67f7995
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion data/presets/presets.json
Original file line number Diff line number Diff line change
Expand Up @@ -685,7 +685,7 @@
"man_made/beacon": {"icon": "maki-communications-tower", "fields": ["name", "height"], "moreFields": ["seamark/type"], "geometry": ["point", "area"], "tags": {"man_made": "beacon"}, "name": "Beacon", "matchScore": 0.5},
"man_made/beehive": {"icon": "fas-archive", "geometry": ["point", "area"], "fields": ["ref", "operator", "seasonal", "height", "colour"], "moreFields": ["manufacturer"], "terms": ["apiary", "beekeeper", "farm", "honey", "pollination"], "tags": {"man_made": "beehive"}, "name": "Beehive"},
"man_made/breakwater": {"fields": ["material", "seamark/type"], "geometry": ["line", "area"], "tags": {"man_made": "breakwater"}, "name": "Breakwater"},
"man_made/bridge": {"icon": "maki-bridge", "fields": ["name", "bridge", "layer", "maxweight"], "moreFields": ["manufacturer", "material", "seamark/type"], "geometry": ["area"], "tags": {"man_made": "bridge"}, "addTags": {"man_made": "bridge", "layer": "1"}, "removeTags": {"man_made": "bridge", "layer": "*"}, "reference": {"key": "man_made", "value": "bridge"}, "name": "Bridge"},
"man_made/bridge": {"icon": "maki-bridge", "fields": ["name", "bridge", "layer", "maxweight"], "moreFields": ["manufacturer", "material", "seamark/type"], "geometry": ["area"], "tags": {"man_made": "bridge"}, "addTags": {"man_made": "bridge", "layer": "1"}, "removeTags": {"man_made": "bridge", "layer": "*"}, "reference": {"key": "man_made", "value": "bridge"}, "name": "Bridge", "matchScore": 0.85},
"man_made/bunker_silo": {"icon": "temaki-silo", "fields": ["content"], "geometry": ["point", "area"], "terms": ["Silage", "Storage"], "tags": {"man_made": "bunker_silo"}, "name": "Bunker Silo"},
"man_made/chimney": {"icon": "temaki-chimney", "fields": ["operator", "material", "height"], "geometry": ["point", "area"], "tags": {"man_made": "chimney"}, "name": "Chimney"},
"man_made/clearcut": {"icon": "maki-logging", "geometry": ["area"], "tags": {"man_made": "clearcut"}, "terms": ["cut", "forest", "lumber", "tree", "wood"], "name": "Clearcut Forest"},
Expand Down
3 changes: 2 additions & 1 deletion data/presets/presets/man_made/bridge.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,6 @@
"key": "man_made",
"value": "bridge"
},
"name": "Bridge"
"name": "Bridge",
"matchScore": 0.85
}
4 changes: 3 additions & 1 deletion modules/validations/tag_suggests_area.js
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,9 @@ export function validationTagSuggestsArea(context) {
},
reference: showReference,
entityIds: [entity.id],
hash: JSON.stringify(tagSuggestingArea),
hash: JSON.stringify(tagSuggestingArea) +
// avoid stale "connect endpoints" fix
(typeof connectEndpointsOnClick),
fixes: fixes
})];

Expand Down

0 comments on commit 67f7995

Please sign in to comment.