midgard/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Fix bug where metatagging would not fully calculate in some cases

Browse source
This commit is contained in:
Pieter Vander Vennet 2021-10-04 00:18:08 +02:00
parent 27a43fdbe0
commit 65470cbac5
8 changed files with 34 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Logic/FeatureSource/FeaturePipeline.ts
View file

@ -353,20 +353,21 @@ export default class FeaturePipeline {
private applyMetaTags(src: FeatureSourceForLayer) {
const self = this
console.debug("Applying metatagging onto ", src.name)
window.setTimeout(
() => {
console.debug("Applying metatagging onto ", src.name)
const layerDef = src.layer.layerDef;
MetaTagging.addMetatags(
src.features.data,
{
memberships: this.relationTracker,
getFeaturesWithin: (layerId, bbox: BBox) => self.GetFeaturesWithin(layerId, bbox)
},
src.layer.layerDef,
layerDef,
{
includeDates: true,
// We assume that the non-dated metatags are already set by the cache generator
includeNonDates: !src.layer.layerDef.source.isOsmCacheLayer
includeNonDates: layerDef.source.geojsonSource === undefined || !layerDef.source.isOsmCacheLayer
}
)
},

10
Logic/MetaTagging.ts
View file

@ -61,7 +61,15 @@ export default class MetaTagging {
// All keys are already defined, we probably already ran this one
continue
}
somethingChanged = somethingChanged || metatag.applyMetaTagsOnFeature(feature, freshness)
const newValueAdded = metatag.applyMetaTagsOnFeature(feature, freshness)
/* Note that the expression:
* `somethingChanged = newValueAdded || metatag.applyMetaTagsOnFeature(feature, freshness)`
* Is WRONG
*
* IF something changed is `true` due to an earlier run, it will short-circuit and _not_ evaluate the right hand of the OR,
* thus not running an update!
*/
somethingChanged = newValueAdded || somethingChanged
} catch (e) {
console.error("Could not calculate metatag for ", metatag.keys.join(","), ":", e, e.stack)
}

10
Logic/SimpleMetaTagger.ts
View file

@ -146,14 +146,14 @@ export default class SimpleMetaTagger {
private static country = new SimpleMetaTagger(
{
keys: ["_country"],
doc: "The country code of the property (with latlon2country)"
doc: "The country code of the property (with latlon2country)",
includesDates: false
},
feature => {
((feature, _) => {
let centerPoint: any = GeoOperations.centerpoint(feature);
const lat = centerPoint.geometry.coordinates[1];
const lon = centerPoint.geometry.coordinates[0];
SimpleMetaTagger.coder?.GetCountryCodeFor(lon, lat, (countries: string[]) => {
try {
const oldCountry = feature.properties["_country"];
@ -167,7 +167,7 @@ export default class SimpleMetaTagger {
}
})
return false;
}
})
)
private static isOpen = new SimpleMetaTagger(
{