Skip to content

Commit fc526f2

Browse files
committedMay 17, 2019
refactor: update marker names
Made it so that markers have a default name, just in case we can't get any from the ajax request.
1 parent 6ab06c5 commit fc526f2

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed
 

‎js/src/markers.js

+10-9
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ var types = {
6666
CarWash : {id: 100, x: 4},
6767
ComedyClub : {id: 102},
6868
Dart : {},
69-
FIB : {id: 106, x: 9},
70-
DollarSign : {id: 108, x: 11},
69+
Fib : {id: 106, x: 9},
70+
Bank : {id: 108, x: 11}, // These are generally "banks". Original: DollarSign
7171
Golf : {},
7272
AmmuNation : {},
7373
Exile : {id: 112},
@@ -81,7 +81,7 @@ var types = {
8181
Key : {id: 134, x: 10},
8282
MovieTheater : {},
8383
Music : {},
84-
Marijuana : {id: 140},
84+
Marijuana : {id: 140, x:14 },
8585
Hunting : {},
8686

8787
ArmsTraffickingGround : {id: 147, y: 4, x: 0},
@@ -93,13 +93,13 @@ var types = {
9393
Knife : {},
9494
Molotov : {},
9595
Pistol : {},
96-
RPG : {},
96+
Rpg : {},
9797
Shotgun : {},
98-
SMG : {},
98+
Smg : {},
9999
Sniper : {},
100100
PointOfInterest: {id: 162},
101-
GTAOPassive : {},
102-
GTAOUsingMenu : {},
101+
GtaOPassive : {},
102+
GtaOUsingMenu : {},
103103

104104
Minigun : {id: 173, x:0, y: 5},
105105
GrenadeLauncher : {},
@@ -123,8 +123,8 @@ var types = {
123123
Chop : {id: 273, x: 3},
124124
Hooker : {id: 279, x: 7},
125125
Friend : {},
126-
GTAOMission: {id: 304, x: 14},
127-
GTAOSurvival : {},
126+
GtaOMission: {id: 304, x: 14},
127+
GtaOSurvival : {},
128128

129129
CrateDrop : { x:0, y:8},
130130
PlaneDrop : {},
@@ -223,6 +223,7 @@ function generateBlipShit(){
223223
}
224224

225225
MarkerTypes[currentId] = {
226+
name: blipName.replace(/([A-Z0-9])/g, ' $1').trim(),
226227
icon: "blips_texturesheet.png",
227228
size: new google.maps.Size( customImageWidth, customImageHeight ),
228229
anchor: new google.maps.Point( customImageWidth/2, customImageHeight ),

0 commit comments

Comments
 (0)