Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

K d tree implementation #44

Merged
merged 21 commits into from
Apr 15, 2024
Merged

K d tree implementation #44

merged 21 commits into from
Apr 15, 2024

Conversation

MessiGames30
Copy link
Collaborator

Salam Alekum alekum salam
KD-tree merging into main.
Our class tree contains both documentattion and test.

kegr and others added 20 commits April 8, 2024 13:23
Added a KDTree implementation
19119d0 
This is a free to use copyrighted KDTree implementation, we will use to our advantage
@Hopsasasa
changed gui folder name
a2a9d55
@MessiGames30
Very good veryt nice algs4.jar
063a49d
added algs4 lib
4dd62ff
removed unimportant imports
c2b15ec
@MessiGames30
Implementation of tree class.
e3499db
@MessiGames30
Further functionality in Tree class
021bbc1
Added methods for getting Tags in tree
9d72136
updated KDTree to upkeep nodes
5045b84
Squashed commit of the following:
ce70e8c 
commit 952c498
Merge: 2f33d78 327af30
Author: Johannes <johannes@orager.dk>
Date:   Tue Apr 9 22:44:22 2024 +0200

    Merge branch 'main' into MapColoringRelations

commit 2f33d78
Author: Andreas Løvsgren Nielsen <75470603+AndreasLN@users.noreply.github.com>
Date:   Tue Apr 9 15:42:44 2024 +0200

    Checks if relation ways are individual polygons

commit fade622
Author: Andreas Løvsgren Nielsen <75470603+AndreasLN@users.noreply.github.com>
Date:   Tue Apr 9 15:13:59 2024 +0200

    Working relation drawing

commit 12e7e9b
Author: Andreas Løvsgren Nielsen <75470603+AndreasLN@users.noreply.github.com>
Date:   Tue Apr 9 13:56:49 2024 +0200

    Functional drawingmap with relations

commit 25afc9b
Author: Andreas Løvsgren Nielsen <75470603+AndreasLN@users.noreply.github.com>
Date:   Tue Apr 9 11:41:20 2024 +0200

    debugging

commit a7ee5e9
Author: Andreas Løvsgren Nielsen <75470603+AndreasLN@users.noreply.github.com>
Date:   Mon Apr 8 16:06:14 2024 +0200

    Merge fixing

commit 3d7b9c7
Merge: 3c01571 557c13c
Author: Andreas Løvsgren Nielsen <75470603+AndreasLN@users.noreply.github.com>
Date:   Mon Apr 8 14:53:23 2024 +0200

    Merge branch 'main' into MapColoringRelations

commit 327af30
Merge: 2bd8df5 d0f81c9
Author: Caniuss <67231982+johannes67890@users.noreply.github.com>
Date:   Mon Apr 8 14:31:26 2024 +0200

    Merge pull request #39 from johannes67890/OSMParserV2

    Osm parser v2

commit d0f81c9
Author: Spurberino <elia07891@gmail.com>
Date:   Mon Apr 8 14:31:02 2024 +0200

    Fixed nullpointer

commit 33f1a50
Author: Spurberino <elia07891@gmail.com>
Date:   Mon Apr 8 13:48:29 2024 +0200

    small spelling error

commit aeddb28
Merge: 073ca15 e01ae7c
Author: Caniuss <johannes@orager.dk>
Date:   Mon Apr 8 13:33:07 2024 +0200

    Merge branch 'OSMParserV2' of https://github.com/johannes67890/MapOfDenmark into OSMParserV2

commit 073ca15
Author: Caniuss <johannes@orager.dk>
Date:   Mon Apr 8 13:33:04 2024 +0200

    Refactor TagWay class to include getSpeedLimit method and update imports

commit e01ae7c
Merge: 0771f75 dc485cf
Author: Andreas Løvsgren Nielsen <75470603+AndreasLN@users.noreply.github.com>
Date:   Mon Apr 8 13:29:24 2024 +0200

    Merge branch 'OSMParserV2' of https://github.com/johannes67890/MapOfDenmark into OSMParserV2

commit 0771f75
Author: Andreas Løvsgren Nielsen <75470603+AndreasLN@users.noreply.github.com>
Date:   Mon Apr 8 13:29:17 2024 +0200

    fix in controller (?)

commit dc485cf
Author: Caniuss <johannes@orager.dk>
Date:   Mon Apr 8 13:23:32 2024 +0200

    Refactor TagWay class to include SPEEDLIMIT in Way enum and XMLBuilder

commit 3c01571
Author: Andreas Løvsgren Nielsen <75470603+AndreasLN@users.noreply.github.com>
Date:   Mon Apr 8 13:09:53 2024 +0200

    gui name change

commit 557c13c
Merge: 08c8179 2bd8df5
Author: Andreas Løvsgren Nielsen <75470603+AndreasLN@users.noreply.github.com>
Date:   Mon Apr 8 12:55:30 2024 +0200

    Merge branch 'main' of https://github.com/johannes67890/MapOfDenmark

commit 6a592c8
Merge: 5fb8ae1 08c8179
Author: Andreas Løvsgren Nielsen <75470603+AndreasLN@users.noreply.github.com>
Date:   Mon Apr 8 12:46:41 2024 +0200

    merge from main

commit 5fb8ae1
Author: Andreas Løvsgren Nielsen <75470603+AndreasLN@users.noreply.github.com>
Date:   Mon Apr 8 12:43:21 2024 +0200

    minimal changes

commit 016ed33
Author: Caniuss <johannes@orager.dk>
Date:   Mon Apr 8 10:58:34 2024 +0200

    Refactor TagWay class to use TagNode objects instead of Long IDs for references

commit 078d34a
Author: Caniuss <johannes@orager.dk>
Date:   Mon Apr 8 10:30:55 2024 +0200

    fix misspell

commit 3aecebb
Author: Andreas Løvsgren Nielsen <75470603+AndreasLN@users.noreply.github.com>
Date:   Thu Apr 4 16:15:45 2024 +0200

    for loop change in drawingmap

commit 1b393de
Author: Andreas Løvsgren Nielsen <75470603+AndreasLN@users.noreply.github.com>
Date:   Thu Apr 4 13:21:23 2024 +0200

    Fix in Type regarding generalization through ambiguous values

commit 04c9b94
Author: Andreas Løvsgren Nielsen <75470603+AndreasLN@users.noreply.github.com>
Date:   Thu Apr 4 12:50:38 2024 +0200

    Line color on polygons, minor scaling fix

commit 9c8bb3c
Author: Andreas Løvsgren Nielsen <75470603+AndreasLN@users.noreply.github.com>
Date:   Wed Apr 3 14:53:16 2024 +0200

    LineClamping, MathUtil creation

commit 2641d5b
Author: Andreas Løvsgren Nielsen <75470603+AndreasLN@users.noreply.github.com>
Date:   Wed Apr 3 13:42:01 2024 +0200

    Priority queues, coloring of polygon ways, some changes in Type

commit 4b84d4b
Author: Andreas Løvsgren Nielsen <75470603+AndreasLN@users.noreply.github.com>
Date:   Tue Apr 2 15:35:34 2024 +0200

    Defining colors in Type

commit e0eb8e1
Author: Andreas Løvsgren Nielsen <75470603+AndreasLN@users.noreply.github.com>
Date:   Tue Apr 2 14:09:26 2024 +0200

    Merge from main

commit c8e5216
Merge: ced63c6 b13bd29
Author: Andreas Løvsgren Nielsen <75470603+AndreasLN@users.noreply.github.com>
Date:   Tue Apr 2 14:06:09 2024 +0200

    Merge pull request #33 from johannes67890/main

    Merge from main

commit 08c8179
Merge: ced63c6 9b72c95
Author: Andreas Løvsgren Nielsen <75470603+AndreasLN@users.noreply.github.com>
Date:   Tue Apr 2 12:51:15 2024 +0200

    Merge branch 'MapDrawing'
Tried to implement our kdtree
2993ced 
didnt go well
Fixed KDTree
c31e49d
@MessiGames30
Getters and setters for treebounds
c07a01e
testing
5a7be20
Works somewhat kdtree
b679785
Improvement to performance
b58cded 
Added a reference to nodes, ways and relations inside the kdtree
Improvement to the screenbounds channel
192ac79 
So we dont render as much useless stuff around the "camera"
Added documentation for KDTree
2909aaf
@MessiGames30
Documentation made in Tree class
fccf6d1
@MessiGames30
test made for tree class yes
177b515
@MessiGames30 MessiGames30 linked an issue Apr 15, 2024 that may be closed by this pull request
KDTree implementation #20
Closed
2 tasks
@johannes67890 johannes67890 merged commit 849aa52 into main Apr 15, 2024
@johannes67890 johannes67890 deleted the K-D-Tree-Implementation branch April 16, 2024 09:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

KDTree implementation
3 participants
@MessiGames30 @johannes67890 @Hopsasasa