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

Memory opt #51

Merged
merged 62 commits into from
Apr 23, 2024
Merged

Memory opt #51

merged 62 commits into from
Apr 23, 2024

Conversation

johannes67890
Copy link
Owner

No description provided.

johannes67890 and others added 30 commits March 18, 2024 13:37
@johannes67890
Refactor XMLReader to OSMReader and update dependencies
2c45534
@johannes67890
Refactor FileParser and add tests
994e590
@johannes67890
Fix center point bug and workon fileparser
2cc006b
@johannes67890
Refactor code and fix method name
241a855
@johannes67890
Add test for isInBounds method
0d85330
@johannes67890
Add constructors to TagBound and TagNode classes
aade9fb
@johannes67890
Fix bug in compasPoints and update test
2955076
@johannes67890
fix bug for inBounds method
bfc9d59
@johannes67890
workon writer
3fbf7c7
@johannes67890
Refactor XMLWriter class to initialize chunk files***
32b8293
@johannes67890
Refactor XMLReader and FileParser classes
7e81ed0
@johannes67890
Add createXML metohds for Tags
4f1aa1a
@johannes67890
Refactor XMLWriter class and add new method writeTagNode()
aaa2ce2
@johannes67890
Add Comparable interface to TagBound class and refactor isInBounds me…
84fb66e 
…thods
@johannes67890
workin
230e2e6
@johannes67890
Refactor XMLReader class and TagWay class
104deed
@johannes67890
Update road types in Type enum
1091250
@johannes67890
Add new XML file and update XMLReader constructor
674a5be
@johannes67890
Refactor Tag class and XMLReader class
8058ed4
@johannes67890
Merge branch 'main' into filestreaming
6c2cf59
@johannes67890
Fix flip error on quadrants
cc19ddc
@johannes67890
Merge pull request #40 from johannes67890/filestreaming
b185874 
Filestreaming
@johannes67890
Import alg4 lib
89d3502
@johannes67890
fix relation error for type parseing
6e8df15
@johannes67890
workon splitting files
72dfb85
@johannes67890
Merge branch 'Filestreaming' of https://github.com/johannes67890/MapO…
4f056a0 
…fDenmark into Filestreaming

��
@johannes67890
Refactor TagRelation class to include a new method getMembers() that …
1c1a7fb 
…returns an ArrayList of TagWay objects. Also, update the isInBounds() method in the Tag class to handle TagWay and TagRelation objects.
@johannes67890
workon
43210c6
@johannes67890
Refactor TagRelation and TagWay classes to use HashMap instead of Arr…
a0ed384 
…ayList for storing members and refs respectively.
@johannes67890
Add dependencies and import statements for new libraries
dc49418
johannes67890 and others added 25 commits April 18, 2024 16:04
@johannes67890
Merge branch 'main' into CustomStructures
073a5b6
@AndreasLN
node clearing
188f9c9
@johannes67890
cleanup
7c5a0cd
@johannes67890
Change hashmap
1ec3bdb
@johannes67890
Refactor XMLReader method calls in TreeTest.java
b4a635d
@johannes67890
cleanup
de8334b
@AndreasLN
TagNodes with integer field
3087fcf
@AndreasLN
Merge branch 'memoryOpt' of https://github.com/johannes67890/MapOfDen…
07cc8fe 
…mark into memoryOpt
@AndreasLN
Functional Graphicssettings
3a8a276
@AndreasLN
Merge branch 'main' into memoryOpt
14f52d9
@AndreasLN
Revert "Merge branch 'main' into memoryOpt"
9eafcea 
This reverts commit 14f52d9, reversing
changes made to 3a8a276.
@AndreasLN
Reapply "Merge branch 'main' into memoryOpt"
77fd2f5 
This reverts commit 9eafcea.
@AndreasLN
Revert "Reapply "Merge branch 'main' into memoryOpt""
0c71f22 
This reverts commit 77fd2f5.
@johannes67890
cleanup Mecator test
b3b8923
@johannes67890
Rename Mecator methods, implement some of "isInBounds", tests and cha…
ef78519 
…nged test file
@johannes67890
Merge branch 'memoryOpt' into Filestreaming
a10060c
@johannes67890
Refactor isInBounds method in Tag.java
968f5bb
@johannes67890
Add old files and add serialization to Tag class
d495907
@johannes67890
Change Mecator projection so negation of lat is in drawMap
544bcf0
@johannes67890
minor changes to chunks
5c1eb53
@johannes67890
fix tree merge error
81d4b53
@johannes67890
comment out broken code
2ee0f3b
@johannes67890
Full fix of merge
30734b1
@johannes67890
Refactor TreeTest class and XMLReaderTest class
b300c15
@AndreasLN
changes from filestreaming
6baf2cb
MessiGames30
MessiGames30 reviewed Apr 23, 2024
View reviewed changes
Copy link
Collaborator

@MessiGames30 MessiGames30 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good

@MessiGames30 MessiGames30 merged commit 22a2f42 into main Apr 23, 2024
AndreasLN added a commit that referenced this pull request Apr 23, 2024
@AndreasLN
Merge pull request #52 from johannes67890/main
d1cb8c9 
Merge pull request #51 from johannes67890/memoryOpt
@johannes67890 johannes67890 deleted the memoryOpt branch April 29, 2024 10:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MessiGames30 MessiGames30 MessiGames30 approved these changes

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
@johannes67890 @MessiGames30 @AndreasLN