Ejemplo n.º 1
0
def changesets_list():
    # load covarge filter and time from request
    coverage_id = request.args.get('coverageId', False)
    coverages = []
    if coverage_id:
        coverages = [coverage_id]

    include_deps = False
    tag_filter = request.args.get('tagFilterId', None)
    if tag_filter:
        tag_filter = Filter.by_id(tag_filter)
        if tag_filter:
            include_deps = tag_filter.include_deps
            tag_filter = tag_filter.code

    time_range = request.args.get('timeRange', None)

    day = date.today()

    if time_range:
        day = day - timedelta(int(time_range))

    result = changesets(current_app.changeset_connection,
                        day=day,
                        filter=tag_filter,
                        include_deps=include_deps,
                        coverages=coverages)
    return jsonify(result)
Ejemplo n.º 2
0
def test_single_node(conn):
    conn.execute('''
        INSERT INTO coverages VALUES (1, 'null island', ST_MakeEnvelope(-10, -10, 10, 10, 4326));
        INSERT INTO coverages VALUES (2, 'somewhere island', ST_MakeEnvelope(100, 0, 110, 10, 4326));
        INSERT INTO nodes VALUES (10000, true, false, false, 10090, ST_SetSRID(ST_MakePoint(0.0, 0.0), 4326), 'u1', 10080, '2018-11-15 17:20:04+00', 1, '"tag"=>"value"');
        INSERT INTO changesets VALUES (10090, '2018-11-15 17:20:04+00', '2018-11-15 17:20:04+00', 1, false, 'u1', 10080, '', ST_MakeEnvelope(0, 0, 0, 0, 4326));
        ''', multi=True)

    cs = changesets(conn, day)
    assert cids(cs) == set([10090])

    cs = changesets(conn, day, coverages=[1])
    assert cids(cs) == set([10090])

    cs = changesets(conn, day, filter="tags->'tag' = 'value'", coverages=[1])
    assert cids(cs) == set([10090])
    cs = changesets(conn, day, filter="tags->'tag' != 'value'", coverages=[1])
    assert cids(cs) == set()

    cs = changesets(conn, day, coverages=[2])
    assert cids(cs) == set()
Ejemplo n.º 3
0
def test_node_moves(conn):
    # node moves through various coverages
    conn.execute('''
        INSERT INTO coverages VALUES (1, 'null island', ST_MakeEnvelope(-10, -10, 10, 10, 4326));
        INSERT INTO coverages VALUES (2, 'another island', ST_MakeEnvelope(10, -10, 30, 10, 4326));
        INSERT INTO coverages VALUES (3, 'all', ST_MakeEnvelope(-10, -10, 50, 10, 4326));
        INSERT INTO nodes VALUES (10000, true, false, false, 10090, ST_SetSRID(ST_MakePoint(0.0, 0.0), 4326), 'u1', 10080, '2018-11-15 17:20:04+00', 1, '');
        INSERT INTO nodes VALUES (10000, false, true, false, 10091, ST_SetSRID(ST_MakePoint(20.0, 0.0), 4326), 'u1', 10080, '2018-11-15 17:20:04+00', 2, '');
        INSERT INTO nodes VALUES (10000, false, true, false, 10092, ST_SetSRID(ST_MakePoint(40.0, 0.0), 4326), 'u1', 10080, '2018-11-15 17:20:04+00', 3, '');
        INSERT INTO changesets VALUES (10090, '2018-11-15 17:20:04+00', '2018-11-15 17:20:04+00', 1, false, 'u1', 10080, '', ST_MakeEnvelope(0, 0, 0, 0, 4326));
        INSERT INTO changesets VALUES (10091, '2018-11-15 17:20:04+00', '2018-11-15 17:20:04+00', 1, false, 'u1', 10080, '', ST_MakeEnvelope(0, 0, 0, 0, 4326));
        INSERT INTO changesets VALUES (10092, '2018-11-15 17:20:04+00', '2018-11-15 17:20:04+00', 1, false, 'u1', 10080, '', ST_MakeEnvelope(0, 0, 0, 0, 4326));
        ''', multi=True)

    cs = changesets(conn, day, coverages=[])
    assert cids(cs) == set([10090, 10091, 10092])

    cs = changesets(conn, day, coverages=[1])
    assert cids(cs) == set([10090])

    cs = changesets(conn, day, coverages=[2])
    assert cids(cs) == set([10091])

    cs = changesets(conn, day, coverages=[1, 2])
    assert cids(cs) == set([10090, 10091])

    cs = changesets(conn, day, coverages=[1, 2, 3])
    assert cids(cs) == set([10090, 10091, 10092])
    cs = changesets(conn, day, coverages=[3])
Ejemplo n.º 4
0
def test_relation_with_node_members(conn):
    # Relation references nodes in different coverages.
    # Changes to way and relation are interleaved. Check that the changeset of the
    # relation only contains the change of the previous way change, but not any other.
    conn.execute('''
        INSERT INTO coverages VALUES (1, 'null island', ST_MakeEnvelope(-10, -10, 10, 10, 4326));
        INSERT INTO coverages VALUES (2, 'another island', ST_MakeEnvelope(10, -10, 30, 10, 4326));
        INSERT INTO coverages VALUES (3, 'all', ST_MakeEnvelope(-10, -10, 50, 10, 4326));

        INSERT INTO nodes VALUES (10000, true, false, false, 10090, ST_SetSRID(ST_MakePoint(0.0, 0.0), 4326), 'u1', 10080, '2018-11-15 17:20:04+00', 1, '');
        INSERT INTO nodes VALUES (10001, true, false, false, 10090, ST_SetSRID(ST_MakePoint(20.0, 0.0), 4326), 'u1', 10080, '2018-11-15 17:20:04+00', 1, '');
        INSERT INTO nodes VALUES (10002, true, false, false, 10090, ST_SetSRID(ST_MakePoint(20.0, 0.0), 4326), 'u1', 10080, '2018-11-15 17:20:04+00', 1, '');

        -- initial relation, node in coverage 1
        INSERT INTO relations VALUES (10070, true, false, false, 10091, 'u1', 10080, '2018-11-15 17:20:04+00', 1, '"comment"=>"new rel", "highway"=>"secondary"');
        INSERT INTO members VALUES (10070, 1, 0, 'node', '', 10000, null, null);

        -- change relation to use node in coverage 2
        INSERT INTO relations VALUES (10070, true, false, false, 10092, 'u1', 10080, '2018-11-15 17:20:04+00', 2, '"comment"=>"mod rel", "highway"=>"secondary"');
        INSERT INTO members VALUES (10070, 2, 0, 'node', '', 10001, null, null);

        -- move node back to coverage 1
        INSERT INTO nodes VALUES (10001, false, true, false, 10093, ST_SetSRID(ST_MakePoint(5.0, 0.0), 4326), 'u1', 10080, '2018-11-15 17:20:04+00', 2, '');
        INSERT INTO relations VALUES (10070, true, false, false, 10094, 'u1', 10080, '2018-11-15 17:20:04+00', 3, '"comment"=>"mod rel", "highway"=>"secondary"');
        INSERT INTO members VALUES (10070, 3, 0, 'node', '', 10001, null, null);

        -- add node in coverage 2
        INSERT INTO relations VALUES (10070, false, true, false, 10095, 'u1', 10080, '2018-11-15 17:20:04+00', 4, '"comment"=>"mod rel", "highway"=>"secondary"');
        INSERT INTO members VALUES (10070, 4, 0, 'node', '', 10001, null, null);
        INSERT INTO members VALUES (10070, 4, 1, 'node', '', 10002, null, null);

        -- we only have changesets for our relations
        INSERT INTO changesets VALUES (10091, '2018-11-15 17:20:04+00', '2018-11-15 17:20:04+00', 1, false, 'u1', 10080, '', ST_MakeEnvelope(0, 0, 0, 0, 4326));
        INSERT INTO changesets VALUES (10092, '2018-11-15 17:20:04+00', '2018-11-15 17:20:04+00', 1, false, 'u1', 10080, '', ST_MakeEnvelope(0, 0, 0, 0, 4326));
        INSERT INTO changesets VALUES (10094, '2018-11-15 17:20:04+00', '2018-11-15 17:20:04+00', 1, false, 'u1', 10080, '', ST_MakeEnvelope(0, 0, 0, 0, 4326));
        INSERT INTO changesets VALUES (10095, '2018-11-15 17:20:04+00', '2018-11-15 17:20:04+00', 1, false, 'u1', 10080, '', ST_MakeEnvelope(0, 0, 0, 0, 4326));
        ''', multi=True)

    cs = changesets(conn, day, coverages=[])
    assert cids(cs) == set([10091, 10092, 10094, 10095])

    cs = changesets(conn, day, coverages=[1])
    assert cids(cs) == set([10091, 10094, 10095])

    cs = changesets(conn, day, coverages=[2])
    assert cids(cs) == set([10092, 10095])

    cs = changesets(conn, day, coverages=[1, 2])
    assert cids(cs) == set([10091, 10092, 10094, 10095])

    cs = changesets(conn, day, coverages=[1, 2, 3])
    assert cids(cs) == set([10091, 10092, 10094, 10095])
    cs = changesets(conn, day, coverages=[3])
    assert cids(cs) == set([10091, 10092, 10094, 10095])
Ejemplo n.º 5
0
def test_way(conn):
    # way references nodes in various coverages
    conn.execute('''
        INSERT INTO coverages VALUES (1, 'null island', ST_MakeEnvelope(-10, -10, 10, 10, 4326));
        INSERT INTO coverages VALUES (2, 'another island', ST_MakeEnvelope(10, -10, 30, 10, 4326));
        INSERT INTO coverages VALUES (3, 'all', ST_MakeEnvelope(-10, -10, 50, 10, 4326));

        INSERT INTO nodes VALUES (10000, true, false, false, 10090, ST_SetSRID(ST_MakePoint(0.0, 0.0), 4326), 'u1', 10080, '2018-11-15 17:20:04+00', 1, '');
        INSERT INTO nodes VALUES (10001, true, false, false, 10090, ST_SetSRID(ST_MakePoint(0.0, 1.0), 4326), 'u1', 10080, '2018-11-15 17:20:04+00', 1, '');
        INSERT INTO nodes VALUES (10002, true, false, false, 10090, ST_SetSRID(ST_MakePoint(20.0, 0.0), 4326), 'u1', 10080, '2018-11-15 17:20:04+00', 1, '');
        INSERT INTO nodes VALUES (10003, true, false, false, 10090, ST_SetSRID(ST_MakePoint(20.0, 1.0), 4326), 'u1', 10080, '2018-11-15 17:20:04+00', 1, '');

        -- in coverage 1
        INSERT INTO ways VALUES (10050, true, false, false, 10091, 'u1', 10080, '2018-11-15 17:20:04+00', 1, '"comment"=>"new way", "highway"=>"secondary"');
        INSERT INTO nds VALUES (10050, 1, 0, 10000);
        INSERT INTO nds VALUES (10050, 1, 1, 10001);

        -- same nodes in coverage 1
        INSERT INTO ways VALUES (10050, false, true, false, 10092, 'u1', 10080, '2018-11-15 17:20:04+00', 2, '"comment"=>"mod way", "highway"=>"primary"');
        INSERT INTO nds VALUES (10050, 2, 0, 10000);
        INSERT INTO nds VALUES (10050, 2, 1, 10001);

        -- nodes in coverage 1 and 2
        INSERT INTO ways VALUES (10050, false, true, false, 10093, 'u1', 10080, '2018-11-15 17:20:04+00', 3, '"comment"=>"mod way", "highway"=>"secondary"');
        INSERT INTO nds VALUES (10050, 3, 0, 10002);
        INSERT INTO nds VALUES (10050, 3, 1, 10001);

        -- nodes in coverage 2
        INSERT INTO ways VALUES (10050, false, true, false, 10094, 'u1', 10080, '2018-11-15 17:20:04+00', 4, '"comment"=>"mod way", "highway"=>"tertiary"');
        INSERT INTO nds VALUES (10050, 4, 0, 10002);
        INSERT INTO nds VALUES (10050, 4, 1, 10003);

        -- move nodes to coverage 1
        INSERT INTO nodes VALUES (10002, false, true, false, 10095, ST_SetSRID(ST_MakePoint(0.0, 0.0), 4326), 'u1', 10080, '2018-11-15 17:20:04+00', 2, '');
        INSERT INTO nodes VALUES (10003, false, true, false, 10095, ST_SetSRID(ST_MakePoint(0.0, 1.0), 4326), 'u1', 10080, '2018-11-15 17:20:04+00', 2, '');
        INSERT INTO ways VALUES (10050, false, true, false, 10096, 'u1', 10080, '2018-11-15 17:20:04+00', 5, '"comment"=>"mod way", "highway"=>"secondary"');
        INSERT INTO nds VALUES (10050, 5, 0, 10002);
        INSERT INTO nds VALUES (10050, 5, 1, 10003);

        -- update node to check if we can filter on depending way
        INSERT INTO nodes VALUES (10003, false, true, false, 10097, ST_SetSRID(ST_MakePoint(0.0, 1.0), 4326), 'u1', 10080, '2018-11-15 17:20:04+00', 3, '');

        -- no changeset for our initial nodes
        INSERT INTO changesets VALUES (10091, '2018-11-15 17:20:04+00', '2018-11-15 17:20:04+00', 1, false, 'u1', 10080, '', ST_MakeEnvelope(0, 0, 0, 0, 4326));
        INSERT INTO changesets VALUES (10092, '2018-11-15 17:20:04+00', '2018-11-15 17:20:04+00', 1, false, 'u1', 10080, '', ST_MakeEnvelope(0, 0, 0, 0, 4326));
        INSERT INTO changesets VALUES (10093, '2018-11-15 17:20:04+00', '2018-11-15 17:20:04+00', 1, false, 'u1', 10080, '', ST_MakeEnvelope(0, 0, 0, 0, 4326));
        INSERT INTO changesets VALUES (10094, '2018-11-15 17:20:04+00', '2018-11-15 17:20:04+00', 1, false, 'u1', 10080, '', ST_MakeEnvelope(0, 0, 0, 0, 4326));
        INSERT INTO changesets VALUES (10096, '2018-11-15 17:20:04+00', '2018-11-15 17:20:04+00', 1, false, 'u1', 10080, '', ST_MakeEnvelope(0, 0, 0, 0, 4326));
        INSERT INTO changesets VALUES (10097, '2018-11-15 17:20:04+00', '2018-11-15 17:20:04+00', 1, false, 'u1', 10080, '', ST_MakeEnvelope(0, 0, 0, 0, 4326));
        ''', multi=True)

    cs = changesets(conn, day, coverages=[])
    assert cids(cs) == set([10091, 10092, 10093, 10094, 10096, 10097])

    cs = changesets(conn, day, coverages=[1])
    assert cids(cs) == set([10091, 10092, 10093, 10096, 10097])

    cs = changesets(conn, day, coverages=[2])
    assert cids(cs) == set([10093, 10094])

    cs = changesets(conn, day, coverages=[1, 2])
    assert cids(cs) == set([10091, 10092, 10093, 10094, 10096, 10097])

    cs = changesets(conn, day, coverages=[1, 2, 3])
    assert cids(cs) == set([10091, 10092, 10093, 10094, 10096, 10097])
    cs = changesets(conn, day, coverages=[3])
    assert cids(cs) == set([10091, 10092, 10093, 10094, 10096, 10097])


    # 10097 only changed node without tags
    cs = changesets(conn, day, filter="tags ? 'highway'")
    assert cids(cs) == set([10091, 10092, 10093, 10094, 10096])

    # recursive query includes 10097
    cs = changesets(conn, day, include_deps=True, filter="tags ? 'highway'")
    assert cids(cs) == set([10091, 10092, 10093, 10094, 10096, 10097])
Ejemplo n.º 6
0
def test_relation_with_way_members(conn):
    # Relation references way with nodes in different coverages
    # Changes to way and relation are interleaved. Check that the changeset of the
    # relation only contains the change of the previous way change, but not any other.
    conn.execute('''
        INSERT INTO coverages VALUES (1, 'null island', ST_MakeEnvelope(-10, -10, 10, 10, 4326));
        INSERT INTO coverages VALUES (2, 'another island', ST_MakeEnvelope(10, -10, 30, 10, 4326));
        INSERT INTO coverages VALUES (3, 'all', ST_MakeEnvelope(-10, -10, 50, 10, 4326));

        INSERT INTO nodes VALUES (10000, true, false, false, 10090, ST_SetSRID(ST_MakePoint(0.0, 0.0), 4326), 'u1', 10080, '2018-11-15 17:20:04+00', 1, '');
        INSERT INTO nodes VALUES (10001, true, false, false, 10090, ST_SetSRID(ST_MakePoint(0.0, 1.0), 4326), 'u1', 10080, '2018-11-15 17:20:04+00', 1, '');
        INSERT INTO nodes VALUES (10002, true, false, false, 10090, ST_SetSRID(ST_MakePoint(20.0, 0.0), 4326), 'u1', 10080, '2018-11-15 17:20:04+00', 1, '');
        INSERT INTO nodes VALUES (10003, true, false, false, 10090, ST_SetSRID(ST_MakePoint(20.0, 1.0), 4326), 'u1', 10080, '2018-11-15 17:20:04+00', 1, '');

        INSERT INTO ways VALUES (10050, true, false, false, 10091, 'u1', 10080, '2018-11-15 17:20:04+00', 1, '"comment"=>"new way", "highway"=>"secondary"');
        INSERT INTO nds VALUES (10050, 1, 0, 10000);
        INSERT INTO nds VALUES (10050, 1, 1, 10001);

        INSERT INTO relations VALUES (10070, true, false, false, 10092, 'u1', 10080, '2018-11-15 17:20:04+00', 1, '"comment"=>"new rel", "highway"=>"secondary"');
        INSERT INTO members VALUES (10070, 1, 0, 'way', '', null, 10050, null);

        INSERT INTO ways VALUES (10050, false, true, false, 10093, 'u1', 10080, '2018-11-15 17:20:04+00', 2, '"comment"=>"mod way", "highway"=>"secondary"');
        INSERT INTO nds VALUES (10050, 2, 0, 10000);
        INSERT INTO nds VALUES (10050, 2, 1, 10001);

        INSERT INTO relations VALUES (10070, true, false, false, 10094, 'u1', 10080, '2018-11-15 17:20:04+00', 2, '"comment"=>"new rel", "highway"=>"secondary"');
        INSERT INTO members VALUES (10070, 2, 0, 'way', '', null, 10050, null);

        INSERT INTO ways VALUES (10050, false, true, false, 10095, 'u1', 10080, '2018-11-15 17:20:04+00', 3, '"comment"=>"mod way", "highway"=>"secondary"');
        INSERT INTO nds VALUES (10050, 3, 0, 10002);
        INSERT INTO nds VALUES (10050, 3, 1, 10001);

        INSERT INTO relations VALUES (10070, true, false, false, 10096, 'u1', 10080, '2018-11-15 17:20:04+00', 3, '"comment"=>"new rel", "highway"=>"secondary"');
        INSERT INTO members VALUES (10070, 3, 0, 'way', '', null, 10050, null);

        INSERT INTO ways VALUES (10050, false, true, false, 10097, 'u1', 10080, '2018-11-15 17:20:04+00', 4, '"comment"=>"mod way", "highway"=>"secondary"');
        INSERT INTO nds VALUES (10050, 4, 0, 10002);
        INSERT INTO nds VALUES (10050, 4, 1, 10003);

        INSERT INTO relations VALUES (10070, true, false, false, 10098, 'u1', 10080, '2018-11-15 17:20:04+00', 4, '"comment"=>"new rel", "highway"=>"secondary"');
        INSERT INTO members VALUES (10070, 4, 0, 'way', '', null, 10050, null);


        -- we only have changesets for our relations
        INSERT INTO changesets VALUES (10092, '2018-11-15 17:20:04+00', '2018-11-15 17:20:04+00', 1, false, 'u1', 10080, '', ST_MakeEnvelope(0, 0, 0, 0, 4326));
        INSERT INTO changesets VALUES (10094, '2018-11-15 17:20:04+00', '2018-11-15 17:20:04+00', 1, false, 'u1', 10080, '', ST_MakeEnvelope(0, 0, 0, 0, 4326));
        INSERT INTO changesets VALUES (10096, '2018-11-15 17:20:04+00', '2018-11-15 17:20:04+00', 1, false, 'u1', 10080, '', ST_MakeEnvelope(0, 0, 0, 0, 4326));
        INSERT INTO changesets VALUES (10098, '2018-11-15 17:20:04+00', '2018-11-15 17:20:04+00', 1, false, 'u1', 10080, '', ST_MakeEnvelope(0, 0, 0, 0, 4326));
        ''', multi=True)

    # TODO
    # cs = changesets(conn, day, coverages=[])
    # assert cids(cs) == set()

    cs = changesets(conn, day, coverages=[1])
    assert cids(cs) == set([10092, 10094, 10096])

    cs = changesets(conn, day, coverages=[2])
    assert cids(cs) == set([10096, 10098])

    cs = changesets(conn, day, coverages=[1, 2])
    assert cids(cs) == set([10092, 10094, 10096, 10098])

    cs = changesets(conn, day, coverages=[1, 2, 3])
    assert cids(cs) == set([10092, 10094, 10096, 10098])
    cs = changesets(conn, day, coverages=[3])
    assert cids(cs) == set([10092, 10094, 10096, 10098])