merging changes
This commit is contained in:
parent
61404dd776
commit
0c88632437
2 changed files with 6 additions and 4 deletions
|
|
@ -21,13 +21,13 @@ Ox.MapMarker = function(options) {
|
|||
|
||||
var that = this,
|
||||
typeColor = {
|
||||
country: [0, 128, 255],
|
||||
region: [255, 0, 255],
|
||||
country: [64, 64, 255],
|
||||
region: [0, 192, 192],
|
||||
city: [255, 0, 0],
|
||||
borough: [255, 128, 0],
|
||||
street: [255, 255, 0],
|
||||
premise: [0, 192, 0],
|
||||
feature: [64, 64, 255],
|
||||
premise: [128, 255, 0],
|
||||
feature: [0, 192, 0],
|
||||
other: [128, 128, 128]
|
||||
},
|
||||
areaSize = {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue