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

Map25: found the reason why map25 was not displayed correctly at the very first start. #343

Merged
merged 78 commits into from May 16, 2021
Merged

Map25: found the reason why map25 was not displayed correctly at the very first start. #343

merged 78 commits into from May 16, 2021

Conversation

telemaxx
Copy link
Contributor

and now i know why i had the conflicts...
i had not seen that @wolfgang-ch already had merged map25 to main...
now everything is fine.

telemaxx and others added 30 commits July 28, 2020 17:34
@telemaxx
Merge pull request #61 from wolfgang-ch/main
19e6997 
main2master
@telemaxx
Merge pull request #63 from wolfgang-ch/main
9b31e36 
main2main
@telemaxx
Merge pull request #64 from wolfgang-ch/main
7860453 
main2main
@telemaxx
Revert "removed scaled thumb image, it had the same size as the origi…
58bceb4 
…nal thumb but this was not the reason to remove it, this image was NEVER disposed -> SWT was running very fast out of handles when moving the tour chart slider as this would create a new image for every new slider position, discovered this issue with SWT sleak"

This reverts commit d3e09e3.
@telemaxx
reverted 'reverted "removed scaled image"'
7cef53b
@telemaxx
Merge pull request #65 from wolfgang-ch/main
02e59da 
main2main
@telemaxx
Merge remote-tracking branch 'origin/main' into map25
a939ba1
@telemaxx
Merge pull request #66 from wolfgang-ch/main
e4efb71 
main2main
@telemaxx
Merge pull request #67 from wolfgang-ch/main
6a807df 
main2main
@telemaxx
Merge pull request #68 from wolfgang-ch/main
30fca6e 
main2main
Merge remote-tracking branch 'origin/main' into map25
a3cefa6
Starting with upgrading VTM 0.15
ac58b32 
many changes in Libs...
ItemizedLayer
Mutable marker
before deactivating some red code
1873921
ItemizedLayer<> removing <> for vtm 0.15
900c3da
reactivating changed mapbookmarklayer and
3db044c 
avoid nullpointer when photolist is empty
photolayer modified to work with vtm 0.15
2ac3d07 
and avoiding nullpointer again. 1sr try was nor working.
Photoscaled On/Off
980a501
run save actions for modified files
1e37acf
Debug off
845cb5a
cleanup some codelines
d536d68
latest vtm 0.15 updates
71bcb6b
@telemaxx
Merge pull request #69 from wolfgang-ch/main
9af9a55 
main2main
@telemaxx
resolving conflicts due new "Images" Structure
7676087
@telemaxx
Map25: PhotoLayer-> Starting with Adjustable PhotoSize and save and
78b8388 
restore state
@telemaxx
Map25 Photoresize with working save and restore
55a84a5 
need some cleanup
@telemaxx
resolving one confict
2cfa0e7
@telemaxx
resolving conflicts...
227614c
@telemaxx
solving more conflicts
e7c32c8
@telemaxx
Merge pull request #70 from wolfgang-ch/main
99da454 
main2main
@telemaxx
Merge remote-tracking branch 'origin/main' into map25
17fe6f1
telemaxx added 29 commits May 4, 2021 16:19
@telemaxx
Merge remote-tracking branch 'origin/main' into map25
e4a2cc2
@telemaxx
starting track direction arrows in map25
83629f1
@telemaxx
starting track direction arrows in map25
472d9bc
@telemaxx
removing test icon
fc448ad
@telemaxx
moving arrow shape logic to markertoolkit
128ca06
@telemaxx
cleanup direction arrow
30d771f
@telemaxx
Merge pull request #78 from wolfgang-ch/main
931245c 
main2main
@telemaxx
Merge remote-tracking branch 'origin/main' into map25
6d034e9
@telemaxx
Merge branch 'track_arrow' into map25
3db5c85
@telemaxx
UI for the new Track Direction Arrows
c04a2fc
@telemaxx
shorten the text in the slideout, so the layout looks better
62e1ca2 
Readme Update.
Default the arrows are off now
@telemaxx
show PR numbers in readme
3b67ea9
@telemaxx
small refactorings
2563d42
@telemaxx
resolving conflicts
884c905
@telemaxx
smaller refactoring
0cc3112
@telemaxx
track arrows are per default off, so maps looks like before the update.
92fb62e
@telemaxx
trying to solve last conflicts
e3734f1
@telemaxx
default arrows off
20470ea
@telemaxx
smaller refactoring
7a8e41a
@telemaxx
still conflicts
39283e3
@telemaxx
working on conflicts...
043ad7d
@telemaxx
refactoring again
6871150
@telemaxx
undo refactoring, gave me conflicts again...
136ff7a
@telemaxx
Merge pull request #80 from wolfgang-ch/main
2cb5a1e 
main2main
@telemaxx
Merge remote-tracking branch 'origin/main' into map25
37b08a6
@telemaxx
refactoring
a7b3818
@telemaxx
When starting MT the first time map25 uses the wrong default provider.
8448ba4
@telemaxx
cleanup map2525Providermanager
c8dfff9
@telemaxx
Readme Update
923169b
@wolfgang-ch wolfgang-ch merged commit b052a13 into mytourbook:map25 May 16, 2021
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
2 participants
@telemaxx @wolfgang-ch