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