Bastian-Greshake-Tzovaras/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Revert "Improve typing"

Browse source 
This reverts commit 4d783aae45.
This commit is contained in:
Pieter Vander Vennet 2022-08-24 02:28:41 +02:00
parent 4d783aae45
commit aac736eba8
4 changed files with 8 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Logic/Osm/OsmObject.ts
View file

@ -3,7 +3,6 @@ import * as polygon_features from "../../assets/polygon-features.json";
import {Store, UIEventSource} from "../UIEventSource";
import {BBox} from "../BBox";
import * as OsmToGeoJson from "osmtogeojson";
import {NodeId, OsmId, OsmTags, RelationId, WayId} from "../../Models/OsmFeature";
export abstract class OsmObject {
@ -39,12 +38,10 @@ export abstract class OsmObject {
throw "Backend URL must begin with http"
}
this.backendURL = url;
this.DownloadObject("id/5")
}
public static DownloadObject(id: NodeId, forceRefresh?: boolean ): Store<OsmNode> ;
public static DownloadObject(id: WayId, forceRefresh?: boolean ): Store<OsmWay> ;
public static DownloadObject(id: RelationId, forceRefresh?: boolean ): Store<OsmRelation> ;
public static DownloadObject(id: OsmId, forceRefresh: boolean = false): Store<OsmObject> {
public static DownloadObject(id: string, forceRefresh: boolean = false): Store<OsmObject> {
let src: UIEventSource<OsmObject>;
if (OsmObject.objectCache.has(id)) {
src = OsmObject.objectCache.get(id)
@ -54,14 +51,14 @@ export abstract class OsmObject {
return src;
}
} else {
src = UIEventSource.FromPromise(OsmObject.DownloadObjectAsync(<any> id))
src = UIEventSource.FromPromise(OsmObject.DownloadObjectAsync(id))
}
OsmObject.objectCache.set(id, src);
return src;
}
static async DownloadPropertiesOf(id: OsmId): Promise<OsmTags> {
static async DownloadPropertiesOf(id: string): Promise<any> {
const splitted = id.split("/");
const idN = Number(splitted[1]);
if (idN < 0) {
@ -73,10 +70,7 @@ export abstract class OsmObject {
return rawData.elements[0].tags
}
static async DownloadObjectAsync(id: NodeId): Promise<OsmNode | undefined>;
static async DownloadObjectAsync(id: WayId): Promise<OsmWay | undefined>;
static async DownloadObjectAsync(id: RelationId): Promise<OsmRelation | undefined>;
static async DownloadObjectAsync(id: OsmId): Promise<OsmObject | undefined>{
static async DownloadObjectAsync(id: string): Promise<OsmObject | undefined> {
const splitted = id.split("/");
const type = splitted[0];
const idN = Number(splitted[1]);