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

Fix local caching by hiding latlon2country import

Browse source
This commit is contained in:
Pieter Vander Vennet 2021-10-03 01:57:36 +02:00
parent a4da937033
commit 5bcb879dfe
5 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Logic/MetaTagging.ts
View file

@ -77,7 +77,7 @@ export default class MetaTagging {
} }
if(somethingChanged){ if(somethingChanged){
State.state.allElements.getEventSourceById(feature.properties.id).ping() State.state?.allElements?.getEventSourceById(feature.properties.id)?.ping()
} }
} }
} }
@ -150,7 +150,7 @@ export default class MetaTagging {
for (const f of functions) { for (const f of functions) {
f(params, feature); f(params, feature);
} }
State.state.allElements.getEventSourceById(feature.properties.id).ping(); State.state?.allElements?.getEventSourceById(feature.properties.id)?.ping();
} catch (e) { } catch (e) {
console.error("While calculating a tag value: ", e) console.error("While calculating a tag value: ", e)
} }

1
Logic/Osm/OsmObject.ts
View file

@ -177,7 +177,6 @@ export abstract class OsmObject {
private static constructPolygonFeatures(): Map<string, { values: Set<string>, blacklist: boolean }> { private static constructPolygonFeatures(): Map<string, { values: Set<string>, blacklist: boolean }> {
const result = new Map<string, { values: Set<string>, blacklist: boolean }>(); const result = new Map<string, { values: Set<string>, blacklist: boolean }>();
for (const polygonFeature of polygon_features) { for (const polygonFeature of polygon_features) {
const key = polygonFeature.key; const key = polygonFeature.key;

6
Logic/SimpleMetaTagger.ts
View file

@ -1,15 +1,11 @@
import {GeoOperations} from "./GeoOperations"; import {GeoOperations} from "./GeoOperations";
import State from "../State"; import State from "../State";
import {And} from "./Tags/And";
import {Tag} from "./Tags/Tag";
import {Or} from "./Tags/Or";
import {Utils} from "../Utils"; import {Utils} from "../Utils";
import opening_hours from "opening_hours"; import opening_hours from "opening_hours";
import Combine from "../UI/Base/Combine"; import Combine from "../UI/Base/Combine";
import BaseUIElement from "../UI/BaseUIElement"; import BaseUIElement from "../UI/BaseUIElement";
import Title from "../UI/Base/Title"; import Title from "../UI/Base/Title";
import {FixedUiElement} from "../UI/Base/FixedUiElement"; import {FixedUiElement} from "../UI/Base/FixedUiElement";
import CountryCoder from "latlon2country/index";
const cardinalDirections = { const cardinalDirections = {
@ -21,7 +17,7 @@ const cardinalDirections = {
export default class SimpleMetaTagger { export default class SimpleMetaTagger {
private static coder: CountryCoder = new CountryCoder("https://pietervdvn.github.io/latlon2country/"); public static coder: any;
public static readonly objectMetaInfo = new SimpleMetaTagger( public static readonly objectMetaInfo = new SimpleMetaTagger(
{ {
keys: ["_last_edit:contributor", keys: ["_last_edit:contributor",

1
UI/WikipediaBox.ts
View file

@ -66,6 +66,7 @@ export default class WikipediaBox extends Toggle {
new Combine([Svg.wikipedia_ui().SetStyle("width: 1.5rem").SetClass("mr-3"), new Combine([Svg.wikipedia_ui().SetStyle("width: 1.5rem").SetClass("mr-3"),
new Title(Translations.t.general.wikipedia.wikipediaboxTitle.Clone(), 2)]).SetClass("flex"), new Title(Translations.t.general.wikipedia.wikipediaboxTitle.Clone(), 2)]).SetClass("flex"),
contents]).SetClass("block rounded-xl subtle-background m-1 p-2 flex flex-col") contents]).SetClass("block rounded-xl subtle-background m-1 p-2 flex flex-col")
.SetStyle("max-height: inherit")
super( super(
mainContent, mainContent,
undefined, undefined,

5
index.ts
View file

@ -13,11 +13,14 @@ import AvailableBaseLayers from "./Logic/Actors/AvailableBaseLayers";
import LayoutConfig from "./Models/ThemeConfig/LayoutConfig"; import LayoutConfig from "./Models/ThemeConfig/LayoutConfig";
import Constants from "./Models/Constants"; import Constants from "./Models/Constants";
import MinimapImplementation from "./UI/Base/MinimapImplementation"; import MinimapImplementation from "./UI/Base/MinimapImplementation";
import CountryCoder from "latlon2country/index";
import SimpleMetaTagger from "./Logic/SimpleMetaTagger";
MinimapImplementation.initialize() MinimapImplementation.initialize()
// Workaround for a stupid crash: inject some functions which would give stupid circular dependencies or crash the other nodejs scripts // Workaround for a stupid crash: inject some functions which would give stupid circular dependencies or crash the other nodejs scripts
ValidatedTextField.bestLayerAt = (location, layerPref) => AvailableBaseLayers.SelectBestLayerAccordingTo(location, layerPref) ValidatedTextField.bestLayerAt = (location, layerPref) => AvailableBaseLayers.SelectBestLayerAccordingTo(location, layerPref)
SimpleMetaTagger.coder = new CountryCoder("https://pietervdvn.github.io/latlon2country/");
let defaultLayout = "" let defaultLayout = ""
// --------------------- Special actions based on the parameters ----------------- // --------------------- Special actions based on the parameters -----------------