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

Merge from main #33

Merged
merged 23 commits into from
Apr 2, 2024
Merged

Merge from main #33

merged 23 commits into from
Apr 2, 2024

Conversation

AndreasLN
Copy link
Collaborator

No description provided.

MessiGames30 and others added 23 commits March 19, 2024 12:19
@MessiGames30
Update MainView.java
0dd5913 
Implemented the desired function of a pahtfinder to the GUI
@MessiGames30
Changes made, zipfiles can extra
5fcddda 
Osm files can get unzipped from zip file
When closing application the osm file gets deleted
Only if file user chooses is zip it tries to unzip
@AndreasLN
Map display at start
aac6cc9
Added multiple features related to zoom
a835fed 
Added:
- Zoom level calculator
- Zoom level indicator
- Zoom level minimum and maximum

Extras:
- Cleaned up a bit in MainView
@johannes67890
Update XMLReader constructor to accept filepath instead of FileDistri…
108cdcb 
…buter object
Drag and drop and draw
cc88a25 
Now the app can draw the chosen file when dropped in the start menu
@johannes67890
Add MecatorProjection class and update TagNode constructor
4bd5a3d
@MessiGames30
Ziphandler plus test finished
d29ed94 
Ziphandler with test for it
@AndreasLN
Scaling fix
9b72c95
@johannes67890
Delete src/test/java/org/MainViewTest.java
c7310ad
@AndreasLN
Merge branch 'main' into MapDrawing
72c9a6e
@johannes67890
refactor dir
528fc0a
@johannes67890
Merge branches 'MapDrawing' and 'MapDrawing' of https://github.com/jo…
fa83849 
…hannes67890/MapOfDenmark into MapDrawing
@johannes67890
minor change
77e7d17
@johannes67890
Refactor search functionality in MainView.java
d9474fe
@johannes67890
Merge pull request #31 from johannes67890/MapDrawing
b697914 
Map drawing
@johannes67890
Merge pull request #32 from johannes67890/MecatorProjection
7356718 
Add MecatorProjection class and update TagNode constructor
@johannes67890
Update imports and add new classes
a148927
@MessiGames30
Update MainView.java
3ee627d 
Spis her tag med funktion i mainview
Chili/hvidløg?
@johannes67890
Merge branch 'main' into ZipFileImplementation
9c95f73
@johannes67890
Merge pull request #30 from johannes67890/ZipFileImplementation
9c228c5 
Zip file and pathfinder implementation
@johannes67890
Update main class name and add ZipHandler class
4ff0227
@johannes67890
Refactor import statements in zipHandlerTest.java
b13bd29
@AndreasLN AndreasLN merged commit c8e5216 into MapColoring Apr 2, 2024
Hopsasasa pushed a commit that referenced this pull request Apr 10, 2024
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'
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.

None yet
3 participants
@AndreasLN @MessiGames30 @johannes67890