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

Upgrade and fix webmap #281

Merged
merged 18 commits into from
Feb 13, 2021
Merged

Upgrade and fix webmap #281

merged 18 commits into from
Feb 13, 2021

Conversation

patrikjuvonen
Copy link
Contributor

@patrikjuvonen patrikjuvonen commented Jan 24, 2021 •
edited
Loading

Summary

  • Changes ajax to use Object.defineProperty to avoid direct prototype manipulation and to disable enumeration (required for OpenLayers to work)
  • Switch the OpenLayers layer to a working map asset link (assets.mtasa.com)
    • Reason for hosting the files instead of putting them in here is because of the huge file size of the tiles
  • Change background color of the webmap to be sea color, it's better for eyes instead of the white background
  • Update OpenLayers to 6.5.0
  • Add support for radar blip id 0 with color and size
  • Dead players are now shown as a red tinted player blip
  • Player blips support player rotation now as well
  • Add current map coordinates from mouse position to the top right corner
  • Refactored code a little bit

Untitled

@patrikjuvonen patrikjuvonen mentioned this pull request Jan 24, 2021
Closed
@eAi

This comment has been minimized.

Sign in to view
@patrikjuvonen patrikjuvonen marked this pull request as draft January 24, 2021 22:50
@patrikjuvonen

This comment has been minimized.

Sign in to view
@eAi

This comment has been minimized.

Sign in to view
@patrikjuvonen

This comment has been minimized.

Sign in to view
@patrikjuvonen patrikjuvonen marked this pull request as ready for review January 25, 2021 16:23
@patrikjuvonen patrikjuvonen marked this pull request as draft January 25, 2021 16:55
@patrikjuvonen

This comment has been minimized.

Sign in to view
@eAi

This comment has been minimized.

Sign in to view
@patrikjuvonen

This comment has been minimized.

Sign in to view
@patrikjuvonen
Tweak map position and size
0286aef
@patrikjuvonen
Use html5
6b8ced9
@patrikjuvonen
Minor style nit tweaks
f815279
@patrikjuvonen
Refactor code and upgrade to OpenLayers 6.5.0
4cf298e 
Also added:
- Rotation support to player blips
- Dead player is now shown as tinted red player blip
- Radar blip 0 is now supported with color and size
@patrikjuvonen
Copy link
Contributor Author

patrikjuvonen commented Jan 27, 2021 •
edited
Loading

New changes in this PR:

  • Update OpenLayers to 6.5.0
  • Add support for radar blip id 0 with color and size
  • Dead players are now shown as a red tinted player blip
  • Player blips support player rotation now as well
  • Add current map coordinates from mouse position to the top right corner
  • Refactored code a little bit

@patrikjuvonen patrikjuvonen changed the title Fix webmap not working Upgrade and fixwebmap Jan 27, 2021
@patrikjuvonen patrikjuvonen changed the title Upgrade and fixwebmap Upgrade and fix webmap Jan 27, 2021
@patrikjuvonen patrikjuvonen marked this pull request as ready for review January 27, 2021 22:04
jlillis
jlillis previously requested changes Jan 28, 2021
View reviewed changes
Copy link
Contributor

@jlillis jlillis 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 overall, but there are some editorconfig/prettierrc files added that shouldn't be there. We are still discussing style rules for the repo in #250

[web]/webmap/.editorconfig Outdated Show resolved Hide resolved
[web]/webmap/.prettierrc Outdated Show resolved Hide resolved
[web]/webmap/meta.xml Show resolved Hide resolved
@jlillis jlillis dismissed their stale review February 8, 2021 19:52

Changes made

jlillis
jlillis approved these changes Feb 13, 2021
View reviewed changes
Copy link
Contributor

@jlillis jlillis left a comment

Choose a reason for hiding this comment

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

lgtm

@jlillis jlillis merged commit 8e2b12b into multitheftauto:master Feb 13, 2021
@patrikjuvonen patrikjuvonen added this to the 1.5.9 milestone Apr 22, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jlillis jlillis jlillis approved these changes

Assignees
No one assigned
Labels
bug enhancement resource:webmap
Projects
None yet
Milestone
1.5.9
Development

Successfully merging this pull request may close these issues.
3 participants
@patrikjuvonen @eAi @jlillis