Download needed relations completely, fixes 873
This commit is contained in:
parent
732d4621ae
commit
4fd40c6935
6 changed files with 418 additions and 88 deletions
|
|
@ -10,61 +10,269 @@ import {Tag} from "../../../Logic/Tags/Tag";
|
|||
import LayerConfig from "../../../Models/ThemeConfig/LayerConfig";
|
||||
import {expect} from "chai";
|
||||
|
||||
console.log(process.cwd())
|
||||
let data = JSON.parse(readFileSync("./test/Logic/FeatureSource/osmdata.json", "utf8"))
|
||||
|
||||
const expected = {
|
||||
"type": "Feature",
|
||||
"id": "relation/5759328",
|
||||
"properties": {
|
||||
"timestamp": "2022-06-10T00:46:55Z",
|
||||
"version": 6,
|
||||
"changeset": 122187206,
|
||||
"user": "Pieter Vander Vennet",
|
||||
"uid": 3818858,
|
||||
"amenity": "school",
|
||||
"isced:2011:level": "vocational_lower_secondary;vocational_upper_secondary",
|
||||
"name": "Koninklijk Technisch Atheneum Pro Technica",
|
||||
"school:gender": "mixed",
|
||||
"type": "multipolygon",
|
||||
"website": "http://ktahalle.be/",
|
||||
"id": "relation/5759328",
|
||||
"_backend":"https://osm.org"
|
||||
},
|
||||
"geometry": {
|
||||
"type": "MultiPolygon",
|
||||
"coordinates": [
|
||||
[
|
||||
[
|
||||
[
|
||||
4.2461832,
|
||||
50.7335751
|
||||
],
|
||||
[
|
||||
4.2463167,
|
||||
50.7336785
|
||||
],
|
||||
[
|
||||
4.2463473,
|
||||
50.7337021
|
||||
],
|
||||
[
|
||||
4.2464497,
|
||||
50.7337814
|
||||
],
|
||||
[
|
||||
4.2471698,
|
||||
50.7343389
|
||||
],
|
||||
[
|
||||
4.2469541,
|
||||
50.7344768
|
||||
],
|
||||
[
|
||||
4.2467571,
|
||||
50.7346116
|
||||
],
|
||||
[
|
||||
4.2467727,
|
||||
50.7346199
|
||||
],
|
||||
[
|
||||
4.2465714,
|
||||
50.7347511
|
||||
],
|
||||
[
|
||||
4.2462398,
|
||||
50.7349687
|
||||
],
|
||||
[
|
||||
4.2453546,
|
||||
50.734601
|
||||
],
|
||||
[
|
||||
4.2451895,
|
||||
50.7345103
|
||||
],
|
||||
[
|
||||
4.2448867,
|
||||
50.7342629
|
||||
],
|
||||
[
|
||||
4.244899,
|
||||
50.7342069
|
||||
],
|
||||
[
|
||||
4.2461832,
|
||||
50.7335751
|
||||
]
|
||||
]
|
||||
],
|
||||
[
|
||||
[
|
||||
[
|
||||
4.2444209,
|
||||
50.7353737
|
||||
],
|
||||
[
|
||||
4.2439986,
|
||||
50.7352034
|
||||
],
|
||||
[
|
||||
4.2440303,
|
||||
50.7351755
|
||||
],
|
||||
[
|
||||
4.2440602,
|
||||
50.7351058
|
||||
],
|
||||
[
|
||||
4.2439776,
|
||||
50.7350326
|
||||
],
|
||||
[
|
||||
4.2439558,
|
||||
50.7350132
|
||||
],
|
||||
[
|
||||
4.2438246,
|
||||
50.7348961
|
||||
],
|
||||
[
|
||||
4.2437848,
|
||||
50.73486
|
||||
],
|
||||
[
|
||||
4.2436555,
|
||||
50.7347455
|
||||
],
|
||||
[
|
||||
4.2435905,
|
||||
50.734689
|
||||
],
|
||||
[
|
||||
4.2435494,
|
||||
50.7346601
|
||||
],
|
||||
[
|
||||
4.2435038,
|
||||
50.7346256
|
||||
],
|
||||
[
|
||||
4.2434769,
|
||||
50.7346026
|
||||
],
|
||||
[
|
||||
4.2430948,
|
||||
50.734275
|
||||
],
|
||||
[
|
||||
4.2427978,
|
||||
50.7340052
|
||||
],
|
||||
[
|
||||
4.2430556,
|
||||
50.7338391
|
||||
],
|
||||
[
|
||||
4.2438957,
|
||||
50.7334942
|
||||
],
|
||||
[
|
||||
4.2440204,
|
||||
50.7336368
|
||||
],
|
||||
[
|
||||
4.2442806,
|
||||
50.7338922
|
||||
],
|
||||
[
|
||||
4.2444173,
|
||||
50.7340119
|
||||
],
|
||||
[
|
||||
4.2447379,
|
||||
50.7342925
|
||||
],
|
||||
[
|
||||
4.2450107,
|
||||
50.7345294
|
||||
],
|
||||
[
|
||||
4.2450236,
|
||||
50.7346021
|
||||
],
|
||||
[
|
||||
4.2449643,
|
||||
50.7347019
|
||||
],
|
||||
[
|
||||
4.244711,
|
||||
50.7350821
|
||||
],
|
||||
[
|
||||
4.2444209,
|
||||
50.7353737
|
||||
]
|
||||
]
|
||||
]
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
function test(done: () => void){
|
||||
let fetchedTile = undefined;
|
||||
const neededTiles = new UIEventSource<number[]>([Tiles.tile_index(17, 67081, 44033)]);
|
||||
new OsmFeatureSource({
|
||||
allowedFeatures: new Tag("amenity", "school"),
|
||||
handleTile: tile => {
|
||||
fetchedTile = tile
|
||||
const data = tile.features.data[0].feature
|
||||
expect(data.properties).deep.eq({
|
||||
id: 'relation/5759328', timestamp: '2022-06-10T00:46:55Z',
|
||||
version: 6,
|
||||
changeset: 122187206,
|
||||
user: 'Pieter Vander Vennet',
|
||||
uid: 3818858,
|
||||
amenity: 'school',
|
||||
'isced:2011:level': 'vocational_lower_secondary;vocational_upper_secondary',
|
||||
name: 'Koninklijk Technisch Atheneum Pro Technica',
|
||||
'school:gender': 'mixed',
|
||||
type: 'multipolygon',
|
||||
website: 'http://ktahalle.be/',
|
||||
_backend: 'https://osm.org'
|
||||
})
|
||||
expect(data.geometry.type).eq("MultiPolygon")
|
||||
expect(data).deep.eq(expected)
|
||||
done()
|
||||
},
|
||||
isActive: new UIEventSource<boolean>(true),
|
||||
neededTiles,
|
||||
state: {
|
||||
osmConnection: {
|
||||
Backend(): string {
|
||||
return "https://osm.org"
|
||||
}
|
||||
},
|
||||
filteredLayers: new UIEventSource<FilteredLayer[]>([
|
||||
{
|
||||
appliedFilters: new UIEventSource<Map<string, FilterState>>(undefined),
|
||||
layerDef: new LayerConfig({
|
||||
id: "school",
|
||||
source: {
|
||||
osmTags: "amenity=school"
|
||||
},
|
||||
mapRendering: null
|
||||
}),
|
||||
isDisplayed: new UIEventSource<boolean>(true)
|
||||
}
|
||||
])
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
describe("OsmFeatureSource", () => {
|
||||
|
||||
it("should work", (done) => {
|
||||
it("downloading the full school should give a multipolygon", (done) => {
|
||||
ScriptUtils.fixUtils()
|
||||
let data = JSON.parse(readFileSync("./test/Logic/FeatureSource/osmdata.json", "utf8"))
|
||||
Utils.injectJsonDownloadForTests("https://osm.org/api/0.6/map?bbox=4.24346923828125,50.732978448277514,4.2462158203125,50.73471682490244", data)
|
||||
let fetchedTile = undefined;
|
||||
const neededTiles = new UIEventSource<number[]>([Tiles.tile_index(17, 67081, 44033)]);
|
||||
new OsmFeatureSource({
|
||||
allowedFeatures: new Tag("amenity", "school"),
|
||||
handleTile: tile => {
|
||||
fetchedTile = tile
|
||||
const data = tile.features.data[0].feature
|
||||
expect(data.properties).deep.eq({
|
||||
id: 'relation/5759328', timestamp: '2022-06-10T00:46:55Z',
|
||||
version: 6,
|
||||
changeset: 122187206,
|
||||
user: 'Pieter Vander Vennet',
|
||||
uid: 3818858,
|
||||
amenity: 'school',
|
||||
'isced:2011:level': 'vocational_lower_secondary;vocational_upper_secondary',
|
||||
name: 'Koninklijk Technisch Atheneum Pro Technica',
|
||||
'school:gender': 'mixed',
|
||||
type: 'multipolygon',
|
||||
website: 'http://ktahalle.be/',
|
||||
_backend: 'https://osm.org'
|
||||
})
|
||||
expect(data.geometry.type).eq("MultiPolygon")
|
||||
done()
|
||||
},
|
||||
isActive: new UIEventSource<boolean>(true),
|
||||
neededTiles,
|
||||
state: {
|
||||
osmConnection: {
|
||||
Backend(): string {
|
||||
return "https://osm.org"
|
||||
}
|
||||
},
|
||||
filteredLayers: new UIEventSource<FilteredLayer[]>([
|
||||
{
|
||||
appliedFilters: new UIEventSource<Map<string, FilterState>>(undefined),
|
||||
layerDef: new LayerConfig({
|
||||
id: "school",
|
||||
source: {
|
||||
osmTags: "amenity=school"
|
||||
},
|
||||
mapRendering: null
|
||||
}),
|
||||
isDisplayed: new UIEventSource<boolean>(true)
|
||||
}
|
||||
])
|
||||
}
|
||||
})
|
||||
test(done)
|
||||
})
|
||||
|
||||
it("downloading the partial school polygon should give a multipolygon", (done) => {
|
||||
ScriptUtils.fixUtils()
|
||||
Utils.injectJsonDownloadForTests("https://www.openstreetmap.org/api/0.6/relation/5759328/full", JSON.parse(readFileSync("./test/data/relation_5759328.json","UTF-8")))
|
||||
let data = JSON.parse(readFileSync("./test/Logic/FeatureSource/small_box.json", "utf8"))
|
||||
Utils.injectJsonDownloadForTests("https://osm.org/api/0.6/map?bbox=4.24346923828125,50.732978448277514,4.2462158203125,50.73471682490244", data)
|
||||
test(done)
|
||||
})
|
||||
})
|
||||
1
test/Logic/FeatureSource/small_box.json
Normal file
1
test/Logic/FeatureSource/small_box.json
Normal file
File diff suppressed because one or more lines are too long
|
|
@ -71,7 +71,7 @@ describe("RelationSplitHandler", () => {
|
|||
)
|
||||
|
||||
Utils.injectJsonDownloadForTests(
|
||||
"https://www.openstreetmap.org/api/0.6/relation/9572808",
|
||||
"https://www.openstreetmap.org/api/0.6/relation/9572808/full",
|
||||
{
|
||||
"version": "0.6",
|
||||
"generator": "CGImap 0.8.5 (3128319 spike-07.openstreetmap.org)",
|
||||
|
|
@ -266,7 +266,7 @@ describe("RelationSplitHandler", () => {
|
|||
}
|
||||
)
|
||||
Utils.injectJsonDownloadForTests(
|
||||
"https://www.openstreetmap.org/api/0.6/relation/4374576",
|
||||
"https://www.openstreetmap.org/api/0.6/relation/4374576/full",
|
||||
{
|
||||
"version": "0.6",
|
||||
"generator": "CGImap 0.8.5 (1266692 spike-06.openstreetmap.org)",
|
||||
|
|
@ -552,7 +552,7 @@ describe("RelationSplitHandler", () => {
|
|||
|
||||
it("should split all cycling relation (split 295132739)",
|
||||
async () => {
|
||||
// Lets mimick a split action of https://www.openstreetmap.org/way/295132739
|
||||
// Lets mimic a split action of https://www.openstreetmap.org/way/295132739
|
||||
|
||||
const relation: OsmRelation = <OsmRelation>await OsmObject.DownloadObjectAsync("relation/9572808")
|
||||
const originalNodeIds = [5273988967,
|
||||
|
|
|
|||
|
|
@ -2,22 +2,92 @@ import {describe} from 'mocha'
|
|||
import {expect} from 'chai'
|
||||
import {OsmObject} from "../../../Logic/Osm/OsmObject";
|
||||
import {Utils} from "../../../Utils";
|
||||
import ScriptUtils from "../../../scripts/ScriptUtils";
|
||||
import {readFileSync} from "fs";
|
||||
|
||||
describe("OsmObject", () => {
|
||||
|
||||
|
||||
describe("download referencing ways", () => {
|
||||
|
||||
Utils.injectJsonDownloadForTests(
|
||||
"https://www.openstreetmap.org/api/0.6/node/1124134958/ways", {"version":"0.6","generator":"CGImap 0.8.6 (49805 spike-06.openstreetmap.org)","copyright":"OpenStreetMap and contributors","attribution":"http://www.openstreetmap.org/copyright","license":"http://opendatacommons.org/licenses/odbl/1-0/","elements":[{"type":"way","id":97038428,"timestamp":"2019-06-19T12:26:24Z","version":6,"changeset":71399984,"user":"Pieter Vander Vennet","uid":3818858,"nodes":[1124134958,323729212,323729351,2542460408,187073405],"tags":{"highway":"residential","name":"Brugs-Kerkhofstraat","sett:pattern":"arc","surface":"sett"}},{"type":"way","id":97038434,"timestamp":"2019-06-19T12:26:24Z","version":5,"changeset":71399984,"user":"Pieter Vander Vennet","uid":3818858,"nodes":[1124134958,1124135024,187058607],"tags":{"bicycle":"use_sidepath","highway":"residential","name":"Kerkhofblommenstraat","sett:pattern":"arc","surface":"sett"}},{"type":"way","id":97038435,"timestamp":"2017-12-21T21:41:08Z","version":4,"changeset":54826837,"user":"Jakka","uid":2403313,"nodes":[1124134958,2576628889,1124135035,5298371485,5298371495],"tags":{"bicycle":"use_sidepath","highway":"residential","name":"Kerkhofblommenstraat"}},{"type":"way","id":251446313,"timestamp":"2019-01-07T19:22:47Z","version":4,"changeset":66106872,"user":"M!dgard","uid":763799,"nodes":[1124134958,5243143198,4555715455],"tags":{"foot":"yes","highway":"service"}}]})
|
||||
"https://www.openstreetmap.org/api/0.6/node/1124134958/ways", {
|
||||
"version": "0.6",
|
||||
"generator": "CGImap 0.8.6 (49805 spike-06.openstreetmap.org)",
|
||||
"copyright": "OpenStreetMap and contributors",
|
||||
"attribution": "http://www.openstreetmap.org/copyright",
|
||||
"license": "http://opendatacommons.org/licenses/odbl/1-0/",
|
||||
"elements": [{
|
||||
"type": "way",
|
||||
"id": 97038428,
|
||||
"timestamp": "2019-06-19T12:26:24Z",
|
||||
"version": 6,
|
||||
"changeset": 71399984,
|
||||
"user": "Pieter Vander Vennet",
|
||||
"uid": 3818858,
|
||||
"nodes": [1124134958, 323729212, 323729351, 2542460408, 187073405],
|
||||
"tags": {
|
||||
"highway": "residential",
|
||||
"name": "Brugs-Kerkhofstraat",
|
||||
"sett:pattern": "arc",
|
||||
"surface": "sett"
|
||||
}
|
||||
}, {
|
||||
"type": "way",
|
||||
"id": 97038434,
|
||||
"timestamp": "2019-06-19T12:26:24Z",
|
||||
"version": 5,
|
||||
"changeset": 71399984,
|
||||
"user": "Pieter Vander Vennet",
|
||||
"uid": 3818858,
|
||||
"nodes": [1124134958, 1124135024, 187058607],
|
||||
"tags": {
|
||||
"bicycle": "use_sidepath",
|
||||
"highway": "residential",
|
||||
"name": "Kerkhofblommenstraat",
|
||||
"sett:pattern": "arc",
|
||||
"surface": "sett"
|
||||
}
|
||||
}, {
|
||||
"type": "way",
|
||||
"id": 97038435,
|
||||
"timestamp": "2017-12-21T21:41:08Z",
|
||||
"version": 4,
|
||||
"changeset": 54826837,
|
||||
"user": "Jakka",
|
||||
"uid": 2403313,
|
||||
"nodes": [1124134958, 2576628889, 1124135035, 5298371485, 5298371495],
|
||||
"tags": {"bicycle": "use_sidepath", "highway": "residential", "name": "Kerkhofblommenstraat"}
|
||||
}, {
|
||||
"type": "way",
|
||||
"id": 251446313,
|
||||
"timestamp": "2019-01-07T19:22:47Z",
|
||||
"version": 4,
|
||||
"changeset": 66106872,
|
||||
"user": "M!dgard",
|
||||
"uid": 763799,
|
||||
"nodes": [1124134958, 5243143198, 4555715455],
|
||||
"tags": {"foot": "yes", "highway": "service"}
|
||||
}]
|
||||
})
|
||||
|
||||
|
||||
it("should download referencing ways",
|
||||
it("should download referencing ways",
|
||||
async () => {
|
||||
|
||||
|
||||
|
||||
|
||||
const ways = await OsmObject.DownloadReferencingWays("node/1124134958")
|
||||
expect(ways).not.undefined
|
||||
expect(ways).length(4)
|
||||
})
|
||||
|
||||
|
||||
it("should download full OSM-relations", async () => {
|
||||
ScriptUtils.fixUtils()
|
||||
Utils.injectJsonDownloadForTests("https://www.openstreetmap.org/api/0.6/relation/5759328/full", JSON.parse(readFileSync("./test/data/relation_5759328.json","UTF-8")))
|
||||
const r = await OsmObject.DownloadObjectAsync("relation/5759328").then(x => x)
|
||||
const geojson = r.asGeoJson();
|
||||
expect(geojson.geometry.type).eq("MultiPolygon")
|
||||
})
|
||||
})
|
||||
|
||||
})
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue