diff --git a/gradle.properties b/gradle.properties index dfd716637e..0ef2db782c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -81,7 +81,7 @@ MOGO_LOCATION_VERSION=1.4.7.20 MOGO_TELEMATIC_VERSION=1.4.7.20 ######## MogoAiCloudSDK Version ######## # 自研地图 -MAP_SDK_VERSION=3.3.2.2 +MAP_SDK_VERSION=3.3.3.7 MAP_SDK_DATA_VERSION=1.0.0.7 MAP_SDK_OPERATION_VERSION=1.1.4.1 # websocket diff --git a/libraries/mapmodule/src/main/assets/shaders/fMogo_Shader.glsl b/libraries/mapmodule/src/main/assets/shaders/fMogo_Shader.glsl index fb09ea5922..944703bc6c 100644 --- a/libraries/mapmodule/src/main/assets/shaders/fMogo_Shader.glsl +++ b/libraries/mapmodule/src/main/assets/shaders/fMogo_Shader.glsl @@ -38,10 +38,22 @@ uniform float waveVel; uniform vec4 waveColor; uniform float waveTime; in highp float waveOff; + +uniform bool isLeadLine; +uniform bool isLeadLineShowArrow; +uniform bool isLeadLineShowBright; +uniform float leadLineArrowTime; +uniform float leadLineWaveVel; +uniform vec4 leadLineWaveColor; +uniform float leadLineWaveTime; +in highp float leadLineWaveOff; +uniform float leadLineTotalUVY; +uniform bool isLeadLineUseWorldPos; out vec4 fragColor; in float distanceFromCamera; in float guideLineTexY; - +in float leadLineTexY; +in vec2 leadLineFlowLightUV; uniform bool isFogEnable; uniform vec3 fogColor; uniform float fogStart; @@ -57,6 +69,21 @@ uniform float blurStart; uniform float blurEnd; uniform float blurDensity; uniform float zoom; +uniform bool isScaleInSkybox; +uniform bool isRoadbed; +uniform vec4 roadbedMixColor1; +uniform vec4 roadbedMixColor2; +uniform bool isGreenBelt; +uniform vec4 greenBeltMixColor1; +uniform vec4 greenBeltMixColor2; +uniform bool isPlane; +uniform vec4 planeMixColor1; +uniform vec4 planeMixColor2; +uniform bool isMorning; +uniform bool isEvening; +uniform bool isDaytime; +uniform bool isBuilding; +in vec4 ndc; void setSpotLightColor(){ //聚光灯光照效果 lowp float r_base= 4.0; lowp float r_max = spotRadius * 32.0; @@ -106,6 +133,10 @@ void setColor(){ fragColor = _color; } void setTex(){ + if(isScaleInSkybox){ + if(_uv.y<0.0 || _uv.y>1.0) + discard; + } fragColor = texture(texId,_uv); } float getShadowOffset(float x, float y) @@ -141,6 +172,48 @@ highp float k = clamp(cos(waveTime/20.0*waveVel-waveOff), 0.0,1.0); k = clamp(pow(k, 25.0),0.02,0.98); fragColor = mix(_color,waveColor,k); } +void setLeadLine(){ + fragColor = _color; + if(isLeadLineShowBright){ + float posFac = leadLineTexY / leadLineTotalUVY; //当前位置距起始位置的长度,在引导线总长度中的比例 + float flowLightIntensity0 = 0.0; //流光强度因子 + if(posFac>=0.0 && posFac<0.15) //流光强度根据距离变化 + flowLightIntensity0 = mix(0.4,0.7,smoothstep(0.0,0.15,posFac)); + else + flowLightIntensity0 = mix(0.7,0.0,smoothstep(0.15,1.0,posFac)); + float flowLightIntensity1 = clamp(cos(leadLineWaveTime/20.0*leadLineWaveVel-leadLineFlowLightUV.y), 0.0,1.0); + flowLightIntensity1 = pow(flowLightIntensity1, 25.0); + if (flowLightIntensity1 > 0.98) flowLightIntensity1 = 1.0; + else if (flowLightIntensity1 < 0.02) flowLightIntensity1 = 0.0; + fragColor = mix(fragColor,leadLineWaveColor,flowLightIntensity1*flowLightIntensity0); + } + bool isArrowPixel = false; + if(isLeadLineShowArrow){ + if(_uv.y>-10.0){ + vec2 scaleUV = _uv; + scaleUV.y += leadLineArrowTime; + float m = mod(scaleUV.y,5.0); + if(m>=0.0 && m<1.0){ + scaleUV.x = (scaleUV.x - 0.5)*1.8 + 0.5; //对箭头在x方向上缩放 + if(scaleUV.x>=0.0 && scaleUV.x<=1.0){ + vec4 c = texture(texId,scaleUV); + if(c.a>0.0){ + isArrowPixel = true; + float k = smoothstep(-10.0,-6.0,_uv.y); + fragColor.rgb = mix(fragColor.rgb,c.rgb,c.a*k); + } + } + } + } + } + if(!isArrowPixel){ //对引导线x方向两侧模糊,排除箭头像素 + float dis2Center = abs(_uv.x-0.5); + const float q = 0.2; //模糊范围 + const float minAlpha = 0.3; //最边缘的透明度 + if(dis2Center>q) + fragColor.a*=(1.0-smoothstep(q,0.5,dis2Center))*(1.0-minAlpha)+minAlpha; + } +} void setSignalLine(){ if(signalLineObj==0){ if(signalLineStep==0 && _uv.y>1.0) @@ -192,6 +265,10 @@ void setBlur() } void main() { + if(isLeadLine){ + setLeadLine(); + return; + } if (isRenderZebra) setZebra(); else if (isRenderSignalLine) @@ -226,4 +303,22 @@ void main() } setLinearFog(); setBlur(); + float y = (ndc.y / ndc.w+1.0)*0.5; + y = smoothstep(0.0,1.0,y); + if(isDaytime || isMorning || isEvening || isRoadbed || isGreenBelt || isPlane){ + vec4 c = vec4(0.0); + if(isRoadbed){ + c = mix(roadbedMixColor1,roadbedMixColor2,y); + } + if(isGreenBelt){ + c = mix(greenBeltMixColor1,greenBeltMixColor2,y); + } + if(isPlane){ + c = mix(planeMixColor1,planeMixColor2,y); + } + if(isBuilding){ + c = mix(planeMixColor1,planeMixColor2,y); + } + fragColor.rgb = mix(fragColor.rgb,c.rgb,c.a); + } } \ No newline at end of file diff --git a/libraries/mapmodule/src/main/assets/shaders/fSelfCar_Shader.glsl b/libraries/mapmodule/src/main/assets/shaders/fSelfCar_Shader.glsl index 20b8270e9e..cbe9e4b130 100644 --- a/libraries/mapmodule/src/main/assets/shaders/fSelfCar_Shader.glsl +++ b/libraries/mapmodule/src/main/assets/shaders/fSelfCar_Shader.glsl @@ -32,6 +32,8 @@ uniform float blurDensity; uniform vec3 cameraPos; uniform float zoom; uniform bool isIce; +uniform bool isUsePureColor; +uniform vec4 pureColor; in vec3 posInEye; layout(location = 0) out vec4 fragColor; //锚点变色逻辑,高爽写得代码,逻辑没变,复制到这 @@ -104,7 +106,12 @@ void main() if(diffuse!=0.0) specular = pow(max(dot(H, N),0.0), specularPow); //高光系数 vec4 oriColor=vec4(0.0); //片元原来的颜色 - oriColor = changeColorMethod(texture(texId,fragTexCoord) * colorFac); + vec4 baseColor=vec4(0.0); + if(isUsePureColor) + baseColor = pureColor; + else + baseColor = texture(texId,fragTexCoord); + oriColor = changeColorMethod(baseColor * colorFac); fragColor = oriColor * (ambientColor + diffuseColor * diffuse) + specularColor * specular; //融合这几种颜色 fragColor+=oriColor*vec4(0.3)*max(dot(vec3(0,0,1),N),0.0); //罗欢说模型屁股那太黑,给屁股那增加点颜色 if(isIce) diff --git a/libraries/mapmodule/src/main/assets/shaders/fSkyBox_Shader.glsl b/libraries/mapmodule/src/main/assets/shaders/fSkyBox_Shader.glsl index 8aadb2857f..54c7ddfd46 100644 --- a/libraries/mapmodule/src/main/assets/shaders/fSkyBox_Shader.glsl +++ b/libraries/mapmodule/src/main/assets/shaders/fSkyBox_Shader.glsl @@ -1,6 +1,9 @@ #version 300 es precision mediump float; -uniform samplerCube texId; +uniform samplerCube texId0; +uniform samplerCube texId1; +uniform bool isTwo; +uniform float alpha; uniform bool isFogEnable; uniform vec3 fogColor; uniform float fogStart; @@ -18,6 +21,28 @@ void setLinearFog() } void main() { - fragColor = texture(texId, _uv); + vec3 uv = _uv; + if(uv.x==1.0){ + uv.y = _uv.z; + uv.z = -_uv.y; + }else if(uv.x==-1.0){ + uv.y = _uv.z; + uv.z = -_uv.y; + }else if(uv.y==1.0){ + uv.x = -_uv.x; + uv.z = -_uv.z; + }else if(uv.y==-1.0){ + } +// if(uv.y!=-1.0 && uv.x!=1.0 && uv.y!=1.0){ +// fragColor.rgba = vec4(1.0); +// return; +// } + if(!isTwo){ + fragColor = texture(texId0, uv); + }else{ + fragColor.rgb = mix(texture(texId0, uv),texture(texId1, uv),alpha).rgb; + fragColor.a = 1.0; + } +// fragColor = vec4(_uv.z,0.0,0.0,1.0); setLinearFog(); } \ No newline at end of file diff --git a/libraries/mapmodule/src/main/assets/shaders/vMogo_Shader.glsl b/libraries/mapmodule/src/main/assets/shaders/vMogo_Shader.glsl index ca308e4525..2da5a49892 100644 --- a/libraries/mapmodule/src/main/assets/shaders/vMogo_Shader.glsl +++ b/libraries/mapmodule/src/main/assets/shaders/vMogo_Shader.glsl @@ -28,8 +28,17 @@ uniform vec3 dividerPos0; uniform vec3 dividerPos1; uniform bool isGuideLine; //引导线 uniform float guideLineTime; + +uniform bool isLeadLine; +uniform float leadLineWaveTime; +uniform float leadLineArrowTime; +uniform float leadLineTotalUVY; +uniform bool isLeadLineUseWorldPos; +uniform bool isScaleInSkybox; +uniform bool isBuilding; layout( location = 0 ) in vec4 pos; layout(location = 1) in vec4 color; +layout(location = 2) in vec3 normal; layout(location = 3) in vec2 uv; out vec4 posInLight; //从光源位置看此片元的proj坐标 out vec4 _color; @@ -39,6 +48,10 @@ out vec2 _uv; out float signalLineTexY; out float waveOff; out float guideLineTexY; +out float leadLineWaveOff; +out float leadLineTexY; +out vec2 leadLineFlowLightUV; +out vec4 ndc; void setZebra(){ vec4 pos0 = projMat*viewMat*modelMat * vec4(zebraPos0,1.0); vec4 pos1 = projMat*viewMat*modelMat * vec4(zebraPos1,1.0); @@ -63,6 +76,9 @@ void setColor(){ } void setTex(){ _uv = uv; + if(isScaleInSkybox){ + _uv.y = (_uv.y-0.5)*2.0 + 0.5; + } } bool hasSetPosInEye = false; void setPosInEye(){ @@ -78,7 +94,20 @@ void setWater(){ _uv.x = _uv.x + waterTime; } void setWave(){ - waveOff = pos.y / 1000.0 /2.0; + vec4 p = modelMat * pos; + waveOff = p.y/10.0; +} +void setLeadLine(){ + leadLineWaveOff = smoothstep(0.0,leadLineTotalUVY/10.0,_uv.y/10.0); + leadLineTexY = _uv.y; + if(isLeadLineUseWorldPos){ + vec4 p = modelMat * pos; + _uv.y = -p.y; + leadLineFlowLightUV.y = p.y/10.0/5.0; + }else{ + _uv.y = -_uv.y; + leadLineFlowLightUV = _uv + vec2(0.0,1.0)*leadLineArrowTime*5.0; + } } void setSignalLine(){ if(signalLineObj==1 && signalLineStep>0){ @@ -96,8 +125,19 @@ void setGuideLine(){ } void main() { + if(isBuilding){ + _uv = uv; + } worldPos = (modelMat * pos).xyz; setPosInEye(); + if(isLeadLine){ + setTex(); + setColor(); + setLeadLine(); + gl_Position = projMat*viewMat*modelMat * pos; + ndc = gl_Position; + return; + } if(isRenderDivider){ vec4 pos0 = projMat*viewMat*modelMat * vec4(dividerPos0,1.0); vec4 pos1 = projMat*viewMat*modelMat * vec4(dividerPos1,1.0); @@ -126,5 +166,7 @@ void main() setSignalLine(); if(isGuideLine) setGuideLine(); + gl_Position = projMat*viewMat*modelMat * pos; + ndc = gl_Position; } \ No newline at end of file diff --git a/libraries/mapmodule/src/main/assets/shaders/vSkyBox_Shader.glsl b/libraries/mapmodule/src/main/assets/shaders/vSkyBox_Shader.glsl index 4f02bf8822..fc78ccfe59 100644 --- a/libraries/mapmodule/src/main/assets/shaders/vSkyBox_Shader.glsl +++ b/libraries/mapmodule/src/main/assets/shaders/vSkyBox_Shader.glsl @@ -3,10 +3,14 @@ precision mediump float; uniform mat4 modelMat; uniform mat4 viewMat; uniform mat4 projMat; +uniform bool isTest; layout( location = 0) in vec4 pos; out vec3 _uv; void main() { - gl_Position = (projMat * viewMat * modelMat * pos).xyww; + if(isTest) + gl_Position = (projMat * viewMat * modelMat * pos).xyzw; + else + gl_Position = (projMat * viewMat * modelMat * pos).xyww; _uv = pos.xyz; } \ No newline at end of file diff --git a/libraries/mapmodule/src/main/assets/style/connector_lineDay.png b/libraries/mapmodule/src/main/assets/style/connector_lineDay.png index d34e6ebfcd..8da673fd78 100644 Binary files a/libraries/mapmodule/src/main/assets/style/connector_lineDay.png and b/libraries/mapmodule/src/main/assets/style/connector_lineDay.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/100-120-speed.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/100-120-speed.png new file mode 100644 index 0000000000..ec5054b5ce Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/100-120-speed.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/16-19_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/16-19_white.png new file mode 100644 index 0000000000..558bc23266 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/16-19_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/16-19_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/16-19_yellow.png new file mode 100644 index 0000000000..c33000b391 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/16-19_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/16_18.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/16_18.png new file mode 100644 index 0000000000..3781dd6740 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/16_18.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/17-19_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/17-19_white.png new file mode 100644 index 0000000000..15b1b42d40 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/17-19_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/17-19_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/17-19_yellow.png new file mode 100644 index 0000000000..d3e41b6ccd Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/17-19_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/17-20_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/17-20_white.png new file mode 100644 index 0000000000..9c088de47b Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/17-20_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/17-20_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/17-20_yellow.png new file mode 100644 index 0000000000..5c4425af71 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/17-20_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/1730-1930-white.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/1730-1930-white.png new file mode 100644 index 0000000000..4895fc30ce Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/1730-1930-white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/1730-1930-yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/1730-1930-yellow.png new file mode 100644 index 0000000000..248e737821 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/1730-1930-yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/40-speed-white.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/40-speed-white.png new file mode 100644 index 0000000000..bb0a246575 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/40-speed-white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/40-speed-yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/40-speed-yellow.png new file mode 100644 index 0000000000..6bdd37f989 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/40-speed-yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/415_1.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/415_1.png new file mode 100644 index 0000000000..1119936e5a Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/415_1.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/416.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/416.png new file mode 100644 index 0000000000..54b4fd54e3 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/416.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/6-20_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/6-20_white.png new file mode 100644 index 0000000000..91100d8ec2 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/6-20_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/6-22_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/6-22_white.png new file mode 100644 index 0000000000..b210f0a54a Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/6-22_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/60-100-speed.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/60-100-speed.png new file mode 100644 index 0000000000..1416657c66 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/60-100-speed.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/60-80-speed.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/60-80-speed.png new file mode 100644 index 0000000000..2ac13d6028 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/60-80-speed.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/60-speed.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/60-speed.png new file mode 100644 index 0000000000..6f49d09568 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/60-speed.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/7-10-speed.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/7-10-speed.png new file mode 100644 index 0000000000..619a89fe7c Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/7-10-speed.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/7-22.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/7-22.png new file mode 100644 index 0000000000..1e771e45de Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/7-22.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/7-9_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/7-9_white.png new file mode 100644 index 0000000000..c0c1698851 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/7-9_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/7-9_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/7-9_yellow.png new file mode 100644 index 0000000000..c72e383182 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/7-9_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/80-100-speed.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/80-100-speed.png new file mode 100644 index 0000000000..8469614925 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/80-100-speed.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/80-speed.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/80-speed.png new file mode 100644 index 0000000000..f764ae51d6 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/80-speed.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/90-120-speed.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/90-120-speed.png new file mode 100644 index 0000000000..e11daa89be Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/90-120-speed.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/AcrossLane.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/AcrossLane.png new file mode 100644 index 0000000000..adf58d144a Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/AcrossLane.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/BigRectForbidArea.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/BigRectForbidArea.png new file mode 100644 index 0000000000..cb65fa5828 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/BigRectForbidArea.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/BigSquareForbidArea.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/BigSquareForbidArea.png new file mode 100644 index 0000000000..028fd4f105 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/BigSquareForbidArea.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/ForbidArea.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/ForbidArea.png new file mode 100644 index 0000000000..b4e5bbb09e Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/ForbidArea.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/ParkingLotSign.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/ParkingLotSign.png new file mode 100644 index 0000000000..7416165e3d Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/ParkingLotSign.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/ReversibleLane.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/ReversibleLane.png new file mode 100644 index 0000000000..10aee51edb Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/ReversibleLane.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/Rhombus.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/Rhombus.png new file mode 100644 index 0000000000..3b9cd2432b Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/Rhombus.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/School.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/School.png new file mode 100644 index 0000000000..10b1981c47 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/School.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/SmaRectForbidArea.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/SmaRectForbidArea.png new file mode 100644 index 0000000000..a413245d89 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/SmaRectForbidArea.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/SmaSquareForbidArea.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/SmaSquareForbidArea.png new file mode 100644 index 0000000000..e86d4702a8 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/SmaSquareForbidArea.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/SpeedBump1_red.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/SpeedBump1_red.png new file mode 100644 index 0000000000..8eb59e4286 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/SpeedBump1_red.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/SpeedBump1_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/SpeedBump1_white.png new file mode 100644 index 0000000000..639c5503a1 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/SpeedBump1_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/SpeedBump1_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/SpeedBump1_yellow.png new file mode 100644 index 0000000000..970a9b97fd Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/SpeedBump1_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/SpeedBump2_red.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/SpeedBump2_red.png new file mode 100644 index 0000000000..471ad03b6e Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/SpeedBump2_red.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/SpeedBump2_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/SpeedBump2_white.png new file mode 100644 index 0000000000..a340429b36 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/SpeedBump2_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/SpeedBump2_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/SpeedBump2_yellow.png new file mode 100644 index 0000000000..f9c2ffeb99 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/SpeedBump2_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/SpeedBump3_red.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/SpeedBump3_red.png new file mode 100644 index 0000000000..9fd95da302 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/SpeedBump3_red.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/SpeedBump3_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/SpeedBump3_white.png new file mode 100644 index 0000000000..fee7cf6166 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/SpeedBump3_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/SpeedBump3_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/SpeedBump3_yellow.png new file mode 100644 index 0000000000..55e8fe663a Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/SpeedBump3_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/SpeedBump4_red.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/SpeedBump4_red.png new file mode 100644 index 0000000000..752f41eeb9 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/SpeedBump4_red.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/SpeedBump4_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/SpeedBump4_white.png new file mode 100644 index 0000000000..b558db79da Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/SpeedBump4_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/SpeedBump4_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/SpeedBump4_yellow.png new file mode 100644 index 0000000000..3d59690706 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/SpeedBump4_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/SpeedBump5_red.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/SpeedBump5_red.png new file mode 100644 index 0000000000..ad5aa7c5ce Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/SpeedBump5_red.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/SpeedBump5_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/SpeedBump5_white.png new file mode 100644 index 0000000000..780fe3edbd Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/SpeedBump5_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/SpeedBump5_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/SpeedBump5_yellow.png new file mode 100644 index 0000000000..0900c8e46f Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/SpeedBump5_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/Triangle.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/Triangle.png new file mode 100644 index 0000000000..19d58e3bb7 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/Triangle.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/UnSpeedBump1_red.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/UnSpeedBump1_red.png new file mode 100644 index 0000000000..26540f589f Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/UnSpeedBump1_red.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/UnSpeedBump1_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/UnSpeedBump1_white.png new file mode 100644 index 0000000000..369ad00b66 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/UnSpeedBump1_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/UnSpeedBump1_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/UnSpeedBump1_yellow.png new file mode 100644 index 0000000000..2eaffd3e21 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/UnSpeedBump1_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/UnSpeedBump2_red.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/UnSpeedBump2_red.png new file mode 100644 index 0000000000..057c835059 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/UnSpeedBump2_red.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/UnSpeedBump2_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/UnSpeedBump2_white.png new file mode 100644 index 0000000000..4910f0e515 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/UnSpeedBump2_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/UnSpeedBump2_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/UnSpeedBump2_yellow.png new file mode 100644 index 0000000000..bcd0be6bf5 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/UnSpeedBump2_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/UnSpeedBump3_red.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/UnSpeedBump3_red.png new file mode 100644 index 0000000000..dedb2a8b81 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/UnSpeedBump3_red.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/UnSpeedBump3_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/UnSpeedBump3_white.png new file mode 100644 index 0000000000..da9591f15d Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/UnSpeedBump3_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/UnSpeedBump3_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/UnSpeedBump3_yellow.png new file mode 100644 index 0000000000..feda70ed7d Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/UnSpeedBump3_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/UnSpeedBump4_red.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/UnSpeedBump4_red.png new file mode 100644 index 0000000000..70f8f5aa61 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/UnSpeedBump4_red.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/UnSpeedBump4_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/UnSpeedBump4_white.png new file mode 100644 index 0000000000..792a4e7e8c Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/UnSpeedBump4_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/UnSpeedBump4_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/UnSpeedBump4_yellow.png new file mode 100644 index 0000000000..85552e04e0 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/UnSpeedBump4_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/UnSpeedBump5_red.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/UnSpeedBump5_red.png new file mode 100644 index 0000000000..71845fb3aa Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/UnSpeedBump5_red.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/UnSpeedBump5_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/UnSpeedBump5_white.png new file mode 100644 index 0000000000..53dcf20baf Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/UnSpeedBump5_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/UnSpeedBump5_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/UnSpeedBump5_yellow.png new file mode 100644 index 0000000000..0bece0e9ba Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/UnSpeedBump5_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/VerticalLane.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/VerticalLane.png new file mode 100644 index 0000000000..16b5b21bae Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/VerticalLane.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/WithBusAcross.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/WithBusAcross.png new file mode 100644 index 0000000000..1440d94f9f Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/WithBusAcross.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/WithBusVertical.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/WithBusVertical.png new file mode 100644 index 0000000000..16b5b21bae Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/WithBusVertical.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/battery.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/battery.png new file mode 100644 index 0000000000..f1da3b374a Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/battery.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/bicycle_cross_left.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/bicycle_cross_left.png new file mode 100644 index 0000000000..185407aa47 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/bicycle_cross_left.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/bicycle_cross_right.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/bicycle_cross_right.png new file mode 100644 index 0000000000..2163faa775 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/bicycle_cross_right.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/bicycle_vertical_LL.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/bicycle_vertical_LL.png new file mode 100644 index 0000000000..804a18b616 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/bicycle_vertical_LL.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/bicycle_vertical_left.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/bicycle_vertical_left.png new file mode 100644 index 0000000000..adc906ced7 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/bicycle_vertical_left.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/bicycle_vertical_right.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/bicycle_vertical_right.png new file mode 100644 index 0000000000..1f1a172071 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/bicycle_vertical_right.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/bicycle_vertical_right_down.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/bicycle_vertical_right_down.png new file mode 100644 index 0000000000..55ada63c09 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/bicycle_vertical_right_down.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/bus.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/bus.png new file mode 100644 index 0000000000..6300f3af11 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/bus.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/busLaneAcross.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/busLaneAcross.png new file mode 100644 index 0000000000..366c7f38c6 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/busLaneAcross.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/busLaneVertical.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/busLaneVertical.png new file mode 100644 index 0000000000..dc545cf304 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/busLaneVertical.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/busStation.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/busStation.png new file mode 100644 index 0000000000..8176386662 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/busStation.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/busStop.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/busStop.png new file mode 100644 index 0000000000..efc25574af Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/busStop.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/busTransitLaneV.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/busTransitLaneV.png new file mode 100644 index 0000000000..7ae2cb3d64 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/busTransitLaneV.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/bus_Rapid_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/bus_Rapid_white.png new file mode 100644 index 0000000000..702d22ba8c Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/bus_Rapid_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/bus_Rapid_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/bus_Rapid_yellow.png new file mode 100644 index 0000000000..fc851ceb4d Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/bus_Rapid_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/carpeople.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/carpeople.png new file mode 100644 index 0000000000..4d00789ad6 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/carpeople.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/comityPedestrianC.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/comityPedestrianC.png new file mode 100644 index 0000000000..a4f1ccbb3c Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/comityPedestrianC.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/comityPedestrianCShu.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/comityPedestrianCShu.png new file mode 100644 index 0000000000..03d5b0fa79 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/comityPedestrianCShu.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/comity_Pedestrian.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/comity_Pedestrian.png new file mode 100644 index 0000000000..061d909dbe Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/comity_Pedestrian.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/comity_PedestrianShu.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/comity_PedestrianShu.png new file mode 100644 index 0000000000..a2883290dc Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/comity_PedestrianShu.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/divider15_left.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/divider15_left.png new file mode 100644 index 0000000000..f4c9b68ac0 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/divider15_left.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/divider15_right.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/divider15_right.png new file mode 100644 index 0000000000..a69defc03c Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/divider15_right.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/exit.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/exit.png new file mode 100644 index 0000000000..26d8002ddb Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/exit.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/goStraightTurnRightLeft.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/goStraightTurnRightLeft.png new file mode 100644 index 0000000000..5f18e4c678 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/goStraightTurnRightLeft.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/gostraight.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/gostraight.png new file mode 100644 index 0000000000..e47c770a7e Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/gostraight.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/gostraightleft.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/gostraightleft.png new file mode 100644 index 0000000000..e76913f9fd Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/gostraightleft.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/gostraightleftright.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/gostraightleftright.png new file mode 100644 index 0000000000..ce81a74093 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/gostraightleftright.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/gostraightleftround.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/gostraightleftround.png new file mode 100644 index 0000000000..fdfa403376 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/gostraightleftround.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/gostraightrightround.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/gostraightrightround.png new file mode 100644 index 0000000000..5536c5297b Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/gostraightrightround.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/gostraightrightturn.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/gostraightrightturn.png new file mode 100644 index 0000000000..ddc069fdb0 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/gostraightrightturn.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/hov.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/hov.png new file mode 100644 index 0000000000..9557865592 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/hov.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/ice.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/ice.png new file mode 100644 index 0000000000..cf7e6376af Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/ice.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/leftleftround.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/leftleftround.png new file mode 100644 index 0000000000..122a006c85 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/leftleftround.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/leftrightturn.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/leftrightturn.png new file mode 100644 index 0000000000..d4b5a24ac9 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/leftrightturn.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/leftround.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/leftround.png new file mode 100644 index 0000000000..95b4536dfc Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/leftround.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/leftturn.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/leftturn.png new file mode 100644 index 0000000000..45613cece0 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/leftturn.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/leftwaitturn.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/leftwaitturn.png new file mode 100644 index 0000000000..67dd20451f Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/leftwaitturn.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/motorVehiclesC.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/motorVehiclesC.png new file mode 100644 index 0000000000..380c6b1815 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/motorVehiclesC.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/noCrossLine.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/noCrossLine.png new file mode 100644 index 0000000000..e7e6798085 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/noCrossLine.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/noLeftOrTurn.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/noLeftOrTurn.png new file mode 100644 index 0000000000..739b43768c Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/noLeftOrTurn.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/noStopMarking.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/noStopMarking.png new file mode 100644 index 0000000000..4f4794b68d Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/noStopMarking.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/noTurn.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/noTurn.png new file mode 100644 index 0000000000..b63d967ce5 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/noTurn.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/noleftturn.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/noleftturn.png new file mode 100644 index 0000000000..b0fbb66ce1 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/noleftturn.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/onlyTaxi.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/onlyTaxi.png new file mode 100644 index 0000000000..18b6616da2 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/onlyTaxi.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/plane.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/plane.png new file mode 100644 index 0000000000..40baafc631 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/plane.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/policeSpecialV.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/policeSpecialV.png new file mode 100644 index 0000000000..a04ff59982 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/policeSpecialV.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/rightrightround.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/rightrightround.png new file mode 100644 index 0000000000..228546513d Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/rightrightround.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/rightround.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/rightround.png new file mode 100644 index 0000000000..07d5c7699d Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/rightround.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/rightturn.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/rightturn.png new file mode 100644 index 0000000000..5c2e751ddf Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/rightturn.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/rightwaitturn.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/rightwaitturn.png new file mode 100644 index 0000000000..27be89f406 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/rightwaitturn.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/road.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/road.png new file mode 100644 index 0000000000..189052a312 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/road.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/schoolZone_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/schoolZone_white.png new file mode 100644 index 0000000000..10b1981c47 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/schoolZone_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/schoolZone_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/schoolZone_yellow.png new file mode 100644 index 0000000000..398b418e05 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/schoolZone_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/sideRoad.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/sideRoad.png new file mode 100644 index 0000000000..416eeb43d9 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/sideRoad.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/stop.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/stop.png new file mode 100644 index 0000000000..5705cf6c46 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/stop.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/throughWordsV_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/throughWordsV_white.png new file mode 100644 index 0000000000..6926910472 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/throughWordsV_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/throughWordsV_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/throughWordsV_yellow.png new file mode 100644 index 0000000000..744374c5c6 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/throughWordsV_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/tourRoad.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/tourRoad.png new file mode 100644 index 0000000000..9455fb431a Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/tourRoad.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/walk.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/walk.png new file mode 100644 index 0000000000..8e0e5826bb Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/walk.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/waternormals.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/waternormals.png new file mode 100644 index 0000000000..a3bd6f74fb Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/waternormals.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/zebra.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/zebra.png new file mode 100644 index 0000000000..dbb2c139dd Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/zebra.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/zebra_crossing1.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/zebra_crossing1.png new file mode 100644 index 0000000000..27bcacb57e Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/zebra_crossing1.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/zebra_crossing10.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/zebra_crossing10.png new file mode 100644 index 0000000000..7a239089e3 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/zebra_crossing10.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/zebra_crossing11.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/zebra_crossing11.png new file mode 100644 index 0000000000..412df5d51a Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/zebra_crossing11.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/zebra_crossing12.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/zebra_crossing12.png new file mode 100644 index 0000000000..2f15d8af99 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/zebra_crossing12.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/zebra_crossing13.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/zebra_crossing13.png new file mode 100644 index 0000000000..498d64e5b8 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/zebra_crossing13.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/zebra_crossing2.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/zebra_crossing2.png new file mode 100644 index 0000000000..7ea0e12a6c Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/zebra_crossing2.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/zebra_crossing3.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/zebra_crossing3.png new file mode 100644 index 0000000000..7b061a85c0 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/zebra_crossing3.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/zebra_crossing4.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/zebra_crossing4.png new file mode 100644 index 0000000000..d142e854aa Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/zebra_crossing4.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/zebra_crossing5.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/zebra_crossing5.png new file mode 100644 index 0000000000..e5064edd2c Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/zebra_crossing5.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/zebra_crossing6.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/zebra_crossing6.png new file mode 100644 index 0000000000..ba0f71646a Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/zebra_crossing6.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/zebra_crossing7.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/zebra_crossing7.png new file mode 100644 index 0000000000..99e6906cf6 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/zebra_crossing7.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/zebra_crossing8.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/zebra_crossing8.png new file mode 100644 index 0000000000..fad46892bb Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/zebra_crossing8.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/zebra_crossing9.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/zebra_crossing9.png new file mode 100644 index 0000000000..43e3d74cad Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/zebra_crossing9.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/zebra_polygon.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/zebra_polygon.png new file mode 100644 index 0000000000..af2f101c30 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/zebra_polygon.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/zebra_three.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/zebra_three.png new file mode 100644 index 0000000000..67c7aabd42 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/zebra_three.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/zhuan.png b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/zhuan.png new file mode 100644 index 0000000000..93a32186e0 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/bus_day_mode/zhuan.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/100-120-speed.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/100-120-speed.png new file mode 100644 index 0000000000..1fd3c9f330 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/100-120-speed.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/16-19_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/16-19_white.png new file mode 100644 index 0000000000..5e50920596 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/16-19_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/16-19_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/16-19_yellow.png new file mode 100644 index 0000000000..0400f30a9d Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/16-19_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/16_18.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/16_18.png new file mode 100644 index 0000000000..4d044f127e Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/16_18.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/17-19_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/17-19_white.png new file mode 100644 index 0000000000..f62406b25c Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/17-19_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/17-19_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/17-19_yellow.png new file mode 100644 index 0000000000..53dc75a8ee Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/17-19_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/17-20_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/17-20_white.png new file mode 100644 index 0000000000..606e43065e Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/17-20_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/17-20_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/17-20_yellow.png new file mode 100644 index 0000000000..911786b709 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/17-20_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/1730-1930-white.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/1730-1930-white.png new file mode 100644 index 0000000000..7c64d0a127 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/1730-1930-white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/1730-1930-yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/1730-1930-yellow.png new file mode 100644 index 0000000000..0241761507 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/1730-1930-yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/40-speed-white.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/40-speed-white.png new file mode 100644 index 0000000000..ca096832b3 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/40-speed-white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/40-speed-yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/40-speed-yellow.png new file mode 100644 index 0000000000..535ae318af Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/40-speed-yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/415_1.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/415_1.png new file mode 100644 index 0000000000..5a918bf8ba Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/415_1.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/416.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/416.png new file mode 100644 index 0000000000..54b4fd54e3 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/416.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/6-20_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/6-20_white.png new file mode 100644 index 0000000000..74ad75864f Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/6-20_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/6-22_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/6-22_white.png new file mode 100644 index 0000000000..d2029b049a Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/6-22_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/60-100-speed.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/60-100-speed.png new file mode 100644 index 0000000000..81d619019f Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/60-100-speed.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/60-80-speed.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/60-80-speed.png new file mode 100644 index 0000000000..bf7c679a28 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/60-80-speed.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/60-speed.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/60-speed.png new file mode 100644 index 0000000000..260705aac1 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/60-speed.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/7-10-speed.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/7-10-speed.png new file mode 100644 index 0000000000..9290ca01aa Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/7-10-speed.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/7-22.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/7-22.png new file mode 100644 index 0000000000..c946836c79 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/7-22.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/7-9_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/7-9_white.png new file mode 100644 index 0000000000..f5f0cb19ac Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/7-9_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/7-9_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/7-9_yellow.png new file mode 100644 index 0000000000..7e70040803 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/7-9_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/80-100-speed.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/80-100-speed.png new file mode 100644 index 0000000000..da18e38eb8 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/80-100-speed.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/80-speed.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/80-speed.png new file mode 100644 index 0000000000..63ce8a3a77 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/80-speed.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/90-120-speed.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/90-120-speed.png new file mode 100644 index 0000000000..87eb4fc538 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/90-120-speed.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/AcrossLane.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/AcrossLane.png new file mode 100644 index 0000000000..fe875320b2 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/AcrossLane.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/BigRectForbidArea.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/BigRectForbidArea.png new file mode 100644 index 0000000000..04447381b3 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/BigRectForbidArea.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/BigSquareForbidArea.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/BigSquareForbidArea.png new file mode 100644 index 0000000000..e2f2a92483 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/BigSquareForbidArea.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/ForbidArea.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/ForbidArea.png new file mode 100644 index 0000000000..27f445ac45 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/ForbidArea.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/ParkingLotSign.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/ParkingLotSign.png new file mode 100644 index 0000000000..1c5cc64aa0 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/ParkingLotSign.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/ReversibleLane.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/ReversibleLane.png new file mode 100644 index 0000000000..5208543c33 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/ReversibleLane.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/Rhombus.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/Rhombus.png new file mode 100644 index 0000000000..ed94fe9a6f Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/Rhombus.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/School.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/School.png new file mode 100644 index 0000000000..04bfa62d02 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/School.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/SmaRectForbidArea.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/SmaRectForbidArea.png new file mode 100644 index 0000000000..a044ad9433 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/SmaRectForbidArea.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/SmaSquareForbidArea.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/SmaSquareForbidArea.png new file mode 100644 index 0000000000..569fe3ae25 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/SmaSquareForbidArea.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/SpeedBump1_red.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/SpeedBump1_red.png new file mode 100644 index 0000000000..af6dbf4c2c Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/SpeedBump1_red.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/SpeedBump1_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/SpeedBump1_white.png new file mode 100644 index 0000000000..5a73e24cf2 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/SpeedBump1_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/SpeedBump1_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/SpeedBump1_yellow.png new file mode 100644 index 0000000000..0ea9262d51 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/SpeedBump1_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/SpeedBump2_red.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/SpeedBump2_red.png new file mode 100644 index 0000000000..d43e23fd0e Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/SpeedBump2_red.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/SpeedBump2_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/SpeedBump2_white.png new file mode 100644 index 0000000000..8451237091 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/SpeedBump2_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/SpeedBump2_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/SpeedBump2_yellow.png new file mode 100644 index 0000000000..f1cee41f04 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/SpeedBump2_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/SpeedBump3_red.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/SpeedBump3_red.png new file mode 100644 index 0000000000..5f20b6a8da Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/SpeedBump3_red.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/SpeedBump3_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/SpeedBump3_white.png new file mode 100644 index 0000000000..3cc073dabd Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/SpeedBump3_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/SpeedBump3_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/SpeedBump3_yellow.png new file mode 100644 index 0000000000..fc2270ea91 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/SpeedBump3_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/SpeedBump4_red.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/SpeedBump4_red.png new file mode 100644 index 0000000000..e250587648 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/SpeedBump4_red.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/SpeedBump4_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/SpeedBump4_white.png new file mode 100644 index 0000000000..651a76806c Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/SpeedBump4_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/SpeedBump4_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/SpeedBump4_yellow.png new file mode 100644 index 0000000000..555c991250 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/SpeedBump4_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/SpeedBump5_red.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/SpeedBump5_red.png new file mode 100644 index 0000000000..d58e6d164b Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/SpeedBump5_red.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/SpeedBump5_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/SpeedBump5_white.png new file mode 100644 index 0000000000..6d0c11f2c8 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/SpeedBump5_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/SpeedBump5_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/SpeedBump5_yellow.png new file mode 100644 index 0000000000..bcf978f155 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/SpeedBump5_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/Triangle.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/Triangle.png new file mode 100644 index 0000000000..6fc527ea32 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/Triangle.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/UnSpeedBump1_red.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/UnSpeedBump1_red.png new file mode 100644 index 0000000000..7c53c387ac Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/UnSpeedBump1_red.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/UnSpeedBump1_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/UnSpeedBump1_white.png new file mode 100644 index 0000000000..b53564c0ce Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/UnSpeedBump1_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/UnSpeedBump1_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/UnSpeedBump1_yellow.png new file mode 100644 index 0000000000..a08b371913 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/UnSpeedBump1_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/UnSpeedBump2_red.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/UnSpeedBump2_red.png new file mode 100644 index 0000000000..74167571c2 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/UnSpeedBump2_red.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/UnSpeedBump2_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/UnSpeedBump2_white.png new file mode 100644 index 0000000000..9e945dc79f Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/UnSpeedBump2_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/UnSpeedBump2_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/UnSpeedBump2_yellow.png new file mode 100644 index 0000000000..2d1ef43055 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/UnSpeedBump2_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/UnSpeedBump3_red.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/UnSpeedBump3_red.png new file mode 100644 index 0000000000..37359f300c Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/UnSpeedBump3_red.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/UnSpeedBump3_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/UnSpeedBump3_white.png new file mode 100644 index 0000000000..4a12b27854 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/UnSpeedBump3_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/UnSpeedBump3_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/UnSpeedBump3_yellow.png new file mode 100644 index 0000000000..8837b6499d Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/UnSpeedBump3_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/UnSpeedBump4_red.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/UnSpeedBump4_red.png new file mode 100644 index 0000000000..063cc71ee5 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/UnSpeedBump4_red.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/UnSpeedBump4_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/UnSpeedBump4_white.png new file mode 100644 index 0000000000..c0f27d8068 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/UnSpeedBump4_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/UnSpeedBump4_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/UnSpeedBump4_yellow.png new file mode 100644 index 0000000000..3d1f394ba0 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/UnSpeedBump4_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/UnSpeedBump5_red.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/UnSpeedBump5_red.png new file mode 100644 index 0000000000..15310a0b17 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/UnSpeedBump5_red.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/UnSpeedBump5_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/UnSpeedBump5_white.png new file mode 100644 index 0000000000..a7b290422a Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/UnSpeedBump5_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/UnSpeedBump5_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/UnSpeedBump5_yellow.png new file mode 100644 index 0000000000..be61174e4c Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/UnSpeedBump5_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/VerticalLane.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/VerticalLane.png new file mode 100644 index 0000000000..16b5b21bae Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/VerticalLane.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/WithBusAcross.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/WithBusAcross.png new file mode 100644 index 0000000000..d55a5c2564 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/WithBusAcross.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/WithBusVertical.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/WithBusVertical.png new file mode 100644 index 0000000000..ff5ebd1413 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/WithBusVertical.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/battery.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/battery.png new file mode 100644 index 0000000000..f1da3b374a Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/battery.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/bicycle_cross_left.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/bicycle_cross_left.png new file mode 100644 index 0000000000..575f2290f8 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/bicycle_cross_left.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/bicycle_cross_right.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/bicycle_cross_right.png new file mode 100644 index 0000000000..2c54317a64 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/bicycle_cross_right.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/bicycle_vertical_LL.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/bicycle_vertical_LL.png new file mode 100644 index 0000000000..001ce5b514 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/bicycle_vertical_LL.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/bicycle_vertical_left.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/bicycle_vertical_left.png new file mode 100644 index 0000000000..fd29f99c8e Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/bicycle_vertical_left.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/bicycle_vertical_right.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/bicycle_vertical_right.png new file mode 100644 index 0000000000..4a8df3c400 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/bicycle_vertical_right.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/bicycle_vertical_right_down.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/bicycle_vertical_right_down.png new file mode 100644 index 0000000000..71417e0ebd Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/bicycle_vertical_right_down.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/bus.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/bus.png new file mode 100644 index 0000000000..b60b511792 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/bus.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/busLaneAcross.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/busLaneAcross.png new file mode 100644 index 0000000000..dca55e8210 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/busLaneAcross.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/busLaneVertical.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/busLaneVertical.png new file mode 100644 index 0000000000..0686b377bf Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/busLaneVertical.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/busStation.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/busStation.png new file mode 100644 index 0000000000..b0431009df Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/busStation.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/busStop.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/busStop.png new file mode 100644 index 0000000000..c591fc0c55 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/busStop.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/busTransitLaneV.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/busTransitLaneV.png new file mode 100644 index 0000000000..560b1be926 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/busTransitLaneV.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/bus_Rapid_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/bus_Rapid_white.png new file mode 100644 index 0000000000..f25a1ebd15 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/bus_Rapid_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/bus_Rapid_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/bus_Rapid_yellow.png new file mode 100644 index 0000000000..729f2fa9fa Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/bus_Rapid_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/carpeople.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/carpeople.png new file mode 100644 index 0000000000..cf5865ca74 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/carpeople.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/comityPedestrianC.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/comityPedestrianC.png new file mode 100644 index 0000000000..067e1e375a Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/comityPedestrianC.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/comityPedestrianCShu.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/comityPedestrianCShu.png new file mode 100644 index 0000000000..a77f811fec Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/comityPedestrianCShu.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/comity_Pedestrian.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/comity_Pedestrian.png new file mode 100644 index 0000000000..44e6a74cd0 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/comity_Pedestrian.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/comity_PedestrianShu.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/comity_PedestrianShu.png new file mode 100644 index 0000000000..6cac49cefb Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/comity_PedestrianShu.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/divider15_left.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/divider15_left.png new file mode 100644 index 0000000000..5fe9cd25c4 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/divider15_left.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/divider15_right.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/divider15_right.png new file mode 100644 index 0000000000..94ff2048d4 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/divider15_right.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/exit.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/exit.png new file mode 100644 index 0000000000..b98f961eb4 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/exit.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/goStraightTurnRightLeft.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/goStraightTurnRightLeft.png new file mode 100644 index 0000000000..eb705a71cc Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/goStraightTurnRightLeft.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/gostraight.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/gostraight.png new file mode 100644 index 0000000000..fa143c3896 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/gostraight.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/gostraightleft.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/gostraightleft.png new file mode 100644 index 0000000000..87a76d7904 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/gostraightleft.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/gostraightleftright.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/gostraightleftright.png new file mode 100644 index 0000000000..80ef043cc5 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/gostraightleftright.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/gostraightleftround.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/gostraightleftround.png new file mode 100644 index 0000000000..69dbc91545 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/gostraightleftround.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/gostraightrightround.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/gostraightrightround.png new file mode 100644 index 0000000000..167ef816d0 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/gostraightrightround.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/gostraightrightturn.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/gostraightrightturn.png new file mode 100644 index 0000000000..022044ae62 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/gostraightrightturn.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/hov.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/hov.png new file mode 100644 index 0000000000..9daf485e4e Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/hov.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/ice.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/ice.png new file mode 100644 index 0000000000..cf7e6376af Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/ice.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/leftleftround.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/leftleftround.png new file mode 100644 index 0000000000..299d6b9a95 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/leftleftround.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/leftrightturn.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/leftrightturn.png new file mode 100644 index 0000000000..52b8a360df Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/leftrightturn.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/leftround.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/leftround.png new file mode 100644 index 0000000000..87db9a4e2f Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/leftround.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/leftturn.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/leftturn.png new file mode 100644 index 0000000000..d1666de043 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/leftturn.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/leftwaitturn.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/leftwaitturn.png new file mode 100644 index 0000000000..699fffc733 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/leftwaitturn.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/motorVehiclesC.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/motorVehiclesC.png new file mode 100644 index 0000000000..aa812adf18 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/motorVehiclesC.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/noCrossLine.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/noCrossLine.png new file mode 100644 index 0000000000..f8d2cfa9c3 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/noCrossLine.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/noLeftOrTurn.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/noLeftOrTurn.png new file mode 100644 index 0000000000..c9e074222c Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/noLeftOrTurn.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/noStopMarking.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/noStopMarking.png new file mode 100644 index 0000000000..a011c3bc51 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/noStopMarking.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/noTurn.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/noTurn.png new file mode 100644 index 0000000000..698a9641c5 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/noTurn.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/noleftturn.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/noleftturn.png new file mode 100644 index 0000000000..d3931d8c86 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/noleftturn.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/onlyTaxi.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/onlyTaxi.png new file mode 100644 index 0000000000..ef0f9b5760 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/onlyTaxi.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/plane.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/plane.png new file mode 100644 index 0000000000..40baafc631 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/plane.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/policeSpecialV.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/policeSpecialV.png new file mode 100644 index 0000000000..c15499af04 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/policeSpecialV.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/rightrightround.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/rightrightround.png new file mode 100644 index 0000000000..c427571f0a Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/rightrightround.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/rightround.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/rightround.png new file mode 100644 index 0000000000..9609e214c8 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/rightround.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/rightturn.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/rightturn.png new file mode 100644 index 0000000000..6d1746ea0a Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/rightturn.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/rightwaitturn.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/rightwaitturn.png new file mode 100644 index 0000000000..ecb4ad75bc Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/rightwaitturn.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/road.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/road.png new file mode 100644 index 0000000000..189052a312 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/road.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/schoolZone_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/schoolZone_white.png new file mode 100644 index 0000000000..7e591c2002 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/schoolZone_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/schoolZone_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/schoolZone_yellow.png new file mode 100644 index 0000000000..7f25f23219 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/schoolZone_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/sideRoad.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/sideRoad.png new file mode 100644 index 0000000000..416eeb43d9 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/sideRoad.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/stop.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/stop.png new file mode 100644 index 0000000000..add8223248 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/stop.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/throughWordsV_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/throughWordsV_white.png new file mode 100644 index 0000000000..efeab068f2 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/throughWordsV_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/throughWordsV_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/throughWordsV_yellow.png new file mode 100644 index 0000000000..0ef9187b90 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/throughWordsV_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/tourRoad.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/tourRoad.png new file mode 100644 index 0000000000..9455fb431a Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/tourRoad.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/walk.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/walk.png new file mode 100644 index 0000000000..8e0e5826bb Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/walk.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/waternormals.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/waternormals.png new file mode 100644 index 0000000000..a3bd6f74fb Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/waternormals.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/zebra.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/zebra.png new file mode 100644 index 0000000000..3e83e0793a Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/zebra.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/zebra_crossing1.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/zebra_crossing1.png new file mode 100644 index 0000000000..27bcacb57e Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/zebra_crossing1.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/zebra_crossing10.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/zebra_crossing10.png new file mode 100644 index 0000000000..7a239089e3 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/zebra_crossing10.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/zebra_crossing11.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/zebra_crossing11.png new file mode 100644 index 0000000000..412df5d51a Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/zebra_crossing11.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/zebra_crossing12.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/zebra_crossing12.png new file mode 100644 index 0000000000..2f15d8af99 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/zebra_crossing12.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/zebra_crossing13.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/zebra_crossing13.png new file mode 100644 index 0000000000..498d64e5b8 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/zebra_crossing13.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/zebra_crossing2.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/zebra_crossing2.png new file mode 100644 index 0000000000..7ea0e12a6c Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/zebra_crossing2.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/zebra_crossing3.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/zebra_crossing3.png new file mode 100644 index 0000000000..7b061a85c0 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/zebra_crossing3.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/zebra_crossing4.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/zebra_crossing4.png new file mode 100644 index 0000000000..d142e854aa Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/zebra_crossing4.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/zebra_crossing5.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/zebra_crossing5.png new file mode 100644 index 0000000000..e5064edd2c Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/zebra_crossing5.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/zebra_crossing6.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/zebra_crossing6.png new file mode 100644 index 0000000000..ba0f71646a Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/zebra_crossing6.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/zebra_crossing7.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/zebra_crossing7.png new file mode 100644 index 0000000000..99e6906cf6 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/zebra_crossing7.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/zebra_crossing8.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/zebra_crossing8.png new file mode 100644 index 0000000000..fad46892bb Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/zebra_crossing8.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/zebra_crossing9.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/zebra_crossing9.png new file mode 100644 index 0000000000..43e3d74cad Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/zebra_crossing9.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/zebra_polygon.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/zebra_polygon.png new file mode 100644 index 0000000000..af2f101c30 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/zebra_polygon.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/zebra_three.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/zebra_three.png new file mode 100644 index 0000000000..67c7aabd42 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/zebra_three.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/zhuan.png b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/zhuan.png new file mode 100644 index 0000000000..93a32186e0 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/taxi_day_mode/zhuan.png differ diff --git a/libraries/mapmodule/src/main/assets/style/leadLineArrow.png b/libraries/mapmodule/src/main/assets/style/leadLineArrow.png new file mode 100644 index 0000000000..b843415398 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/leadLineArrow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/skybox/cloudy/negx.png b/libraries/mapmodule/src/main/assets/style/skybox/cloudy/negx.png new file mode 100644 index 0000000000..a50cbce157 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/skybox/cloudy/negx.png differ diff --git a/libraries/mapmodule/src/main/assets/style/skybox/cloudy/negy.png b/libraries/mapmodule/src/main/assets/style/skybox/cloudy/negy.png new file mode 100644 index 0000000000..a50cbce157 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/skybox/cloudy/negy.png differ diff --git a/libraries/mapmodule/src/main/assets/style/skybox/cloudy/negz.png b/libraries/mapmodule/src/main/assets/style/skybox/cloudy/negz.png new file mode 100644 index 0000000000..e1fef07df2 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/skybox/cloudy/negz.png differ diff --git a/libraries/mapmodule/src/main/assets/style/skybox/cloudy/posx.png b/libraries/mapmodule/src/main/assets/style/skybox/cloudy/posx.png new file mode 100644 index 0000000000..a50cbce157 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/skybox/cloudy/posx.png differ diff --git a/libraries/mapmodule/src/main/assets/style/skybox/cloudy/posy.png b/libraries/mapmodule/src/main/assets/style/skybox/cloudy/posy.png new file mode 100644 index 0000000000..a50cbce157 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/skybox/cloudy/posy.png differ diff --git a/libraries/mapmodule/src/main/assets/style/skybox/cloudy/posz.png b/libraries/mapmodule/src/main/assets/style/skybox/cloudy/posz.png new file mode 100644 index 0000000000..a50cbce157 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/skybox/cloudy/posz.png differ diff --git a/libraries/mapmodule/src/main/assets/style/skybox/daytime/1.png b/libraries/mapmodule/src/main/assets/style/skybox/daytime/1.png new file mode 100644 index 0000000000..b09c541274 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/skybox/daytime/1.png differ diff --git a/libraries/mapmodule/src/main/assets/style/skybox/daytime/2.png b/libraries/mapmodule/src/main/assets/style/skybox/daytime/2.png new file mode 100644 index 0000000000..ec446b517f Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/skybox/daytime/2.png differ diff --git a/libraries/mapmodule/src/main/assets/style/skybox/daytime/3.png b/libraries/mapmodule/src/main/assets/style/skybox/daytime/3.png new file mode 100644 index 0000000000..91691ebfcf Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/skybox/daytime/3.png differ diff --git a/libraries/mapmodule/src/main/assets/style/skybox/daytime/4.png b/libraries/mapmodule/src/main/assets/style/skybox/daytime/4.png new file mode 100644 index 0000000000..96547ffd06 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/skybox/daytime/4.png differ diff --git a/libraries/mapmodule/src/main/assets/style/skybox/evening/1.png b/libraries/mapmodule/src/main/assets/style/skybox/evening/1.png new file mode 100644 index 0000000000..651e214ee8 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/skybox/evening/1.png differ diff --git a/libraries/mapmodule/src/main/assets/style/skybox/evening/2.png b/libraries/mapmodule/src/main/assets/style/skybox/evening/2.png new file mode 100644 index 0000000000..c5baa218f4 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/skybox/evening/2.png differ diff --git a/libraries/mapmodule/src/main/assets/style/skybox/evening/3.png b/libraries/mapmodule/src/main/assets/style/skybox/evening/3.png new file mode 100644 index 0000000000..a765a4494f Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/skybox/evening/3.png differ diff --git a/libraries/mapmodule/src/main/assets/style/skybox/evening/4.png b/libraries/mapmodule/src/main/assets/style/skybox/evening/4.png new file mode 100644 index 0000000000..efb081433d Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/skybox/evening/4.png differ diff --git a/libraries/mapmodule/src/main/assets/style/skybox/morning/1.png b/libraries/mapmodule/src/main/assets/style/skybox/morning/1.png new file mode 100644 index 0000000000..651e214ee8 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/skybox/morning/1.png differ diff --git a/libraries/mapmodule/src/main/assets/style/skybox/morning/2.png b/libraries/mapmodule/src/main/assets/style/skybox/morning/2.png new file mode 100644 index 0000000000..c5baa218f4 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/skybox/morning/2.png differ diff --git a/libraries/mapmodule/src/main/assets/style/skybox/morning/3.png b/libraries/mapmodule/src/main/assets/style/skybox/morning/3.png new file mode 100644 index 0000000000..a765a4494f Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/skybox/morning/3.png differ diff --git a/libraries/mapmodule/src/main/assets/style/skybox/morning/4.png b/libraries/mapmodule/src/main/assets/style/skybox/morning/4.png new file mode 100644 index 0000000000..efb081433d Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/skybox/morning/4.png differ diff --git a/libraries/mapmodule/src/main/assets/style/skybox/sunny/negx.png b/libraries/mapmodule/src/main/assets/style/skybox/sunny/negx.png new file mode 100644 index 0000000000..c64ed5f485 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/skybox/sunny/negx.png differ diff --git a/libraries/mapmodule/src/main/assets/style/skybox/sunny/negy.png b/libraries/mapmodule/src/main/assets/style/skybox/sunny/negy.png new file mode 100644 index 0000000000..8b0153383e Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/skybox/sunny/negy.png differ diff --git a/libraries/mapmodule/src/main/assets/style/skybox/sunny/negz.png b/libraries/mapmodule/src/main/assets/style/skybox/sunny/negz.png new file mode 100644 index 0000000000..e1fef07df2 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/skybox/sunny/negz.png differ diff --git a/libraries/mapmodule/src/main/assets/style/skybox/sunny/posx.png b/libraries/mapmodule/src/main/assets/style/skybox/sunny/posx.png new file mode 100644 index 0000000000..339a3361d8 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/skybox/sunny/posx.png differ diff --git a/libraries/mapmodule/src/main/assets/style/skybox/sunny/posy.png b/libraries/mapmodule/src/main/assets/style/skybox/sunny/posy.png new file mode 100644 index 0000000000..9ddf68767c Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/skybox/sunny/posy.png differ diff --git a/libraries/mapmodule/src/main/assets/style/skybox/sunny/posz.png b/libraries/mapmodule/src/main/assets/style/skybox/sunny/posz.png new file mode 100644 index 0000000000..a50cbce157 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/skybox/sunny/posz.png differ diff --git a/libraries/mapmodule/src/main/assets/style/style/normal/vr/bus_day/alpha.cfg b/libraries/mapmodule/src/main/assets/style/style/normal/vr/bus_day/alpha.cfg new file mode 100644 index 0000000000..e5c107d175 --- /dev/null +++ b/libraries/mapmodule/src/main/assets/style/style/normal/vr/bus_day/alpha.cfg @@ -0,0 +1,50 @@ +alpha.tex.path.11.出口.0=/hd_res/bus_day_mode/exit.png +alpha.tex.path.11.前方学校.1=/hd_res/bus_day_mode/schoolZone_white.png +alpha.tex.path.11.前方学校.2=/hd_res/bus_day_mode/schoolZone_yellow.png +alpha.tex.path.11.公交专用.0=/hd_res/bus_day_mode/WithBusVertical.png +alpha.tex.path.11.潮汐车道.0=/hd_res/bus_day_mode/ReversibleLane.png +alpha.tex.path.11.公交车道.0=/hd_res/bus_day_mode/busLaneVertical.png +alpha.tex.path.11.公交车.0=/hd_res/bus_day_mode/bus.png +alpha.tex.path.11.快速公交专用线.1=/hd_res/bus_day_mode/bus_Rapid_white.png +alpha.tex.path.11.快速公交专用线.2=/hd_res/bus_day_mode/bus_Rapid_yellow.png +alpha.tex.path.11.借道区.1=/hd_res/bus_day_mode/throughWordsV_white.png +alpha.tex.path.11.借道区.2=/hd_res/bus_day_mode/throughWordsV_yellow.png +alpha.tex.path.11.公交停靠.0=/hd_res/bus_day_mode/busStop.png +alpha.tex.path.11.警务专用.0=/hd_res/bus_day_mode/policeSpecialV.png +alpha.tex.path.11.礼让行人.1=/hd_res/bus_day_mode/comity_PedestrianShu.png +alpha.tex.path.11.礼让行人.2=/hd_res/bus_day_mode/comityPedestrianCShu.png +alpha.tex.path.11.人行道.0=/hd_res/bus_day_mode/sideRoad.png +alpha.tex.path.11.观光车专用道.0=/hd_res/bus_day_mode/tourRoad.png +alpha.tex.path.12.BATTERY.0=/hd_res/bus_day_mode/battery.png +alpha.tex.path.12.WALK.0=/hd_res/bus_day_mode/walk.png +alpha.tex.path.12.车让人.0=/hd_res/bus_day_mode/carpeople.png +alpha.tex.path.12.公交专用.0=/hd_res/bus_day_mode/WithBusAcross.png +alpha.tex.path.12.公交车道.0=/hd_res/bus_day_mode/busLaneAcross.png +alpha.tex.path.12.礼让行人.1=/hd_res/bus_day_mode/comity_Pedestrian.png +alpha.tex.path.12.礼让行人.2=/hd_res/bus_day_mode/comityPedestrianC.png +alpha.tex.path.12.停.0=/hd_res/bus_day_mode/stop.png +alpha.tex.path.12.请勿越线.2=/hd_res/bus_day_mode/noCrossLine.png +alpha.tex.path.22.7-22.0=/hd_res/bus_day_mode/7-22.png +alpha.tex.path.22.7-9.1=/hd_res/bus_day_mode/7-9_white.png +alpha.tex.path.22.7-9.2=/hd_res/bus_day_mode/7-9_yellow.png +alpha.tex.path.22.17-19.1=/hd_res/bus_day_mode/17-19_white.png +alpha.tex.path.22.17-19.2=/hd_res/bus_day_mode/17-19_yellow.png +alpha.tex.path.22.16-19.1=/hd_res/bus_day_mode/16-19_white.png +alpha.tex.path.22.16-19.2=/hd_res/bus_day_mode/16-19_yellow.png +alpha.tex.path.22.17-20.1=/hd_res/bus_day_mode/17-20_white.png +alpha.tex.path.22.17-20.2=/hd_res/bus_day_mode/17-20_yellow.png +alpha.tex.path.22.6-20.0=/hd_res/bus_day_mode/6-20_white.png +alpha.tex.path.22.6-22.0=/hd_res/bus_day_mode/6-22_white.png +alpha.tex.path.22.7:30-9:30.1=/hd_res/bus_day_mode/1730-1930-white.png +alpha.tex.path.22.7:30-9:30.2=/hd_res/bus_day_mode/1730-1930-yellow.png +alpha.tex.path.22.7-10.0=/hd_res/bus_day_mode/7-10-speed.png +alpha.tex.path.22.16:00-18:00.1=/hd_res/bus_day_mode/16_18.png +alpha.tex.path.31.60-80.0=/hd_res/bus_day_mode/60-80-speed.png +alpha.tex.path.31.80-100.0=/hd_res/bus_day_mode/80-100-speed.png +alpha.tex.path.31.100-120.0=/hd_res/bus_day_mode/100-120-speed.png +alpha.tex.path.31.60-100.0=/hd_res/bus_day_mode/60-100-speed.png +alpha.tex.path.31.90-120.0=/hd_res/bus_day_mode/90-120-speed.png +alpha.tex.path.32.80.0=/hd_res/bus_day_mode/80-speed.png +alpha.tex.path.32.60.0=/hd_res/bus_day_mode/60-speed.png +alpha.tex.path.32.40.1=/hd_res/bus_day_mode/40-speed-white.png +alpha.tex.path.32.40.2=/hd_res/bus_day_mode/40-speed-yellow.png \ No newline at end of file diff --git a/libraries/mapmodule/src/main/assets/style/style/normal/vr/bus_day/arrow.cfg b/libraries/mapmodule/src/main/assets/style/style/normal/vr/bus_day/arrow.cfg new file mode 100644 index 0000000000..50a122cec5 --- /dev/null +++ b/libraries/mapmodule/src/main/assets/style/style/normal/vr/bus_day/arrow.cfg @@ -0,0 +1,65 @@ +arrow.tex.path.201=/hd_res/bus_day_mode/gostraight.png +arrow.tex.path.202=/hd_res/bus_day_mode/gostraightleft.png +arrow.tex.path.203=/hd_res/bus_day_mode/gostraightrightturn.png +arrow.tex.path.204=/hd_res/bus_day_mode/gostraightleftround.png +arrow.tex.path.220=/hd_res/bus_day_mode/gostraightrightround.png +arrow.tex.path.205=/hd_res/bus_day_mode/leftturn.png +arrow.tex.path.206=/hd_res/bus_day_mode/leftleftround.png +arrow.tex.path.207=/hd_res/bus_day_mode/leftwaitturn.png +arrow.tex.path.208=/hd_res/bus_day_mode/rightturn.png +arrow.tex.path.209=/hd_res/bus_day_mode/rightwaitturn.png +arrow.tex.path.210=/hd_res/bus_day_mode/leftrightturn.png +arrow.tex.path.211=/hd_res/bus_day_mode/leftround.png +arrow.tex.path.212=/hd_res/bus_day_mode/noleftturn.png +arrow.tex.path.215=/hd_res/bus_day_mode/gostraightleftright.png +arrow.tex.path.402=/hd_res/bus_day_mode/bicycle_cross_right.png +arrow.tex.path.412=/hd_res/bus_day_mode/bicycle_vertical_right.png +arrow.tex.path.408=/hd_res/bus_day_mode/bicycle_vertical_left.png +arrow.tex.path.410=/hd_res/bus_day_mode/bicycle_cross_left.png +arrow.tex.path.411=/hd_res/bus_day_mode/motorVehiclesC.png +arrow.tex.path.413=/hd_res/bus_day_mode/bicycle_vertical_LL.png +arrow.tex.path.404=/hd_res/bus_day_mode/bicycle_vertical_right_down.png +arrow.tex.path.508=/hd_res/bus_day_mode/Rhombus.png +arrow.tex.path.509=/hd_res/bus_day_mode/Triangle.png +arrow.tex.path.511.1=/hd_res/bus_day_mode/SpeedBump1_white.png +arrow.tex.path.511.2=/hd_res/bus_day_mode/SpeedBump1_yellow.png +arrow.tex.path.511.4=/hd_res/bus_day_mode/SpeedBump1_red.png +arrow.tex.path.501.1=/hd_res/bus_day_mode/SpeedBump2_white.png +arrow.tex.path.501.2=/hd_res/bus_day_mode/SpeedBump2_yellow.png +arrow.tex.path.501.4=/hd_res/bus_day_mode/SpeedBump2_red.png +arrow.tex.path.502.1=/hd_res/bus_day_mode/SpeedBump3_white.png +arrow.tex.path.502.2=/hd_res/bus_day_mode/SpeedBump3_yellow.png +arrow.tex.path.502.4=/hd_res/bus_day_mode/SpeedBump3_red.png +arrow.tex.path.512.1=/hd_res/bus_day_mode/SpeedBump4_white.png +arrow.tex.path.512.2=/hd_res/bus_day_mode/SpeedBump4_yellow.png +arrow.tex.path.512.4=/hd_res/bus_day_mode/SpeedBump4_red.png +arrow.tex.path.517.4=/hd_res/bus_day_mode/SpeedBump5_red.png +arrow.tex.path.517.1=/hd_res/bus_day_mode/SpeedBump5_white.png +arrow.tex.path.517.2=/hd_res/bus_day_mode/SpeedBump5_yellow.png +arrow.tex.path.603=/hd_res/bus_day_mode/BigSquareForbidArea.png +arrow.tex.path.604=/hd_res/bus_day_mode/SmaSquareForbidArea.png +arrow.tex.path.605=/hd_res/bus_day_mode/BigRectForbidArea.png +arrow.tex.path.606=/hd_res/bus_day_mode/SmaRectForbidArea.png +arrow.tex.path.513.1=/hd_res/bus_day_mode/UnSpeedBump1_white.png +arrow.tex.path.513.2=/hd_res/bus_day_mode/UnSpeedBump1_yellow.png +arrow.tex.path.513.4=/hd_res/bus_day_mode/UnSpeedBump1_red.png +arrow.tex.path.514.1=/hd_res/bus_day_mode/UnSpeedBump2_white.png +arrow.tex.path.514.2=/hd_res/bus_day_mode/UnSpeedBump2_yellow.png +arrow.tex.path.514.4=/hd_res/bus_day_mode/UnSpeedBump2_red.png +arrow.tex.path.515.1=/hd_res/bus_day_mode/UnSpeedBump3_white.png +arrow.tex.path.515.2=/hd_res/bus_day_mode/UnSpeedBump3_yellow.png +arrow.tex.path.515.4=/hd_res/bus_day_mode/UnSpeedBump3_red.png +arrow.tex.path.516.1=/hd_res/bus_day_mode/UnSpeedBump4_white.png +arrow.tex.path.516.2=/hd_res/bus_day_mode/UnSpeedBump4_yellow.png +arrow.tex.path.516.4=/hd_res/bus_day_mode/UnSpeedBump4_red.png +arrow.tex.path.518.4=/hd_res/bus_day_mode/UnSpeedBump5_red.png +arrow.tex.path.518.1=/hd_res/bus_day_mode/UnSpeedBump5_white.png +arrow.tex.path.518.2=/hd_res/bus_day_mode/UnSpeedBump5_yellow.png +arrow.tex.path.719=/hd_res/bus_day_mode/busTransitLaneV.png +arrow.tex.path.721=/hd_res/bus_day_mode/hov.png +arrow.tex.path.608=/hd_res/bus_day_mode/noStopMarking.png +arrow.tex.path.219=/hd_res/bus_day_mode/noLeftOrTurn.png +arrow.tex.path.722=/hd_res/bus_day_mode/ParkingLotSign.png +arrow.tex.path.415=/hd_res/bus_day_mode/415_1.png +arrow.tex.path.416=/hd_res/bus_day_mode/416.png +arrow.tex.path.214=/hd_res/bus_day_mode/noTurn.png \ No newline at end of file diff --git a/libraries/mapmodule/src/main/assets/style/style/normal/vr/bus_day/building.cfg b/libraries/mapmodule/src/main/assets/style/style/normal/vr/bus_day/building.cfg new file mode 100644 index 0000000000..01cf71312b --- /dev/null +++ b/libraries/mapmodule/src/main/assets/style/style/normal/vr/bus_day/building.cfg @@ -0,0 +1,18 @@ + +building.icon.path.type.6=/building/加油站.png;465682 //路径;颜色 +building.icon.path.type.30=/building/医院.png;465682 +building.icon.path.type.35=/building/警察局.png;465682 +building.icon.path.type.36=/building/邮局.png;465682 +building.icon.path.type.37=/building/市政府.png;465682 +building.icon.path.type.39=/building/法院.png;465682 +building.icon.path.type.40=/building/政府机构.png;465682 +building.icon.path.type.41=/building/社区活动中心.png;465682 +building.icon.path.type.42=/building/购物中心.png;465682 +building.icon.path.type.44=/building/银行.png;465682 +building.icon.path.type.66=/building/商业设施.png;465682 +building.icon.path.type.67=/building/展览馆.png;465682 +building.icon.path.type.68=/building/火车站.png;465682 +building.icon.path.type.69=/building/公交站.png;465682 +building.icon.path.type.71=/building/飞机场.png;465682 +building.icon.path.type.75=/building/紧急医疗服务.png;465682 +building.icon.path.type.99=/building/mogo.png;465682 \ No newline at end of file diff --git a/libraries/mapmodule/src/main/assets/style/style/normal/vr/bus_day/common.cfg b/libraries/mapmodule/src/main/assets/style/style/normal/vr/bus_day/common.cfg new file mode 100644 index 0000000000..ed35c15918 --- /dev/null +++ b/libraries/mapmodule/src/main/assets/style/style/normal/vr/bus_day/common.cfg @@ -0,0 +1,68 @@ +backGround=B0BED1 //背景色 +road=80,92,112 //路面颜色 +arrow.color.fac=0.95 //箭头颜色因子 +alphaNumeric.color.fac=1.0 //地标颜色因子 +zebra.color.fac=0.98 //斑马线颜色因子 +spotLight=2.5;0.5;1 //聚光灯 半径;亮度;偏移 +shadow=70,85,107,200 //阴影颜色 +greenBelt=6C8C86;9EBDB4 //绿化带 底部颜色;顶部颜色 +dividerLine=228,233,250;228,233,250;1.0 //白色;黄色;颜色因子 +pole=8999B0;4E617E //灯杆渐变颜色 +guardBar=9FB4C8;7C8EA5;B8C8E1 //隔离带颜色 +roadPile=1.0,0.84,0.23;0.18,0.18,0.18;0.25,0.25,0.25 //路桩颜色 +bridgePier=d2d6e4;979aa4 //桥墩颜色 +cable=D2E3FC;D2E3FC;D2E3FC;D2E3FC //电缆颜色1;电缆颜色2;光缆颜色1;光缆颜色2 +area.type.2=D0E7DD //绿地颜色 +area.type.3.color.pure=99C0E7 //水系颜色 +area.type.3.color.gradient=C5E5FE;7CB0E2 //水系颜色,渐变 +area.type.3.ring.width=50 //水系环宽度 +area.type.4=37485E //路面铺装颜色 +area.type.101=B0BED1 //区域块颜色 +regional=889DB5 //人行步道颜色 +building=7fA3B7D0;D0E3FB //建筑物底部颜色;顶部颜色 +camera=BCC3D0 //摄像头颜色 +trafficLight=BCC3D0 //交通灯颜色 +rsu.type.1=BCC3D0 //雷达颜色 +rsu.type.2=BCC3D0 //mec颜色 +rsu.type.3=BCC3D0 //rsu颜色 +//光照 环境光;漫反射;高光;高光的光泽度 +selfCar.light=0.8,0.8,0.8;0.2,0.2,0.2;0.8,0.8,0.8;100.0 //自车 +otherCar.light=0.7,0.7,0.7;0.1,0.1,0.1;0.3,0.3,0.3;11.0 //他车 +others.light=0.7,0.7,0.7;0.1,0.1,0.1;0.6,0.6,0.6;12.0 //除自车和他车外的其他3d锚点 +fog=d0e4ff;40;80;0.8 //雾颜色,起始距离,结束距离,密度 +skybox.lookat=0;-13;8.5;0;0;3; 0;1;0 //天空盒lookat参数 +skybox.proj=60;0.1;100 //天空盒fov,近平面,远平面 +grayscale=#9EC1DFFF +building.text.color=555555 +building.text.size=100 +station.text.color=0.0,0.0,1.0,1.0 +station.text.size=150 +cable.wave.color=0.5,0.8,1.0,1.0 +cable.wave.vel=1.8 +road.tex.path=/hd_res/bus_day_mode/road.png +zebra.tex.path=/hd_res/bus_day_mode/zebra.png +plane.tex.path=/hd_res/bus_day_mode/plane.png +building.tex.path=/hd_res/bus_day_mode/zhuan.png +divider.15.left.tex.path=/hd_res/bus_day_mode/divider15_left.png +divider.15.right.tex.path=/hd_res/bus_day_mode/divider15_right.png +skybox.2d.tex.path=/skyDay.png +road.isGradient=false +road.gradientColor=ffB5C8E6;00B5C8E6 +road.gradientColor_morning=00f2c3b1;fff2c3b1 +road.gradientColor_daytime=ffB5C8E6;00B5C8E6 +road.gradientColor_evening=00f2c3b1;fff2c3b1 +greenbelt.isGradient=false +greenbelt.gradientColor=ffE5F0E8;00E5F0E8 +greenbelt.gradientColor_morning=00f2c3b1;fff2c3b1 +greenbelt.gradientColor_daytime=ffE5F0E8;00E5F0E8 +greenbelt.gradientColor_evening=00f2c3b1;fff2c3b1 +plane.isGradient=false +plane.gradientColor=ffB5C8E6;00B5C8E6 +plane.gradientColor_morning=00f2c3b1;fff2c3b1 +plane.gradientColor_daytime=ffB5C8E6;00B5C8E6 +plane.gradientColor_evening=00f2c3b1;fff2c3b1 + + + + + diff --git a/libraries/mapmodule/src/main/assets/style/style/normal/vr/day/building.cfg b/libraries/mapmodule/src/main/assets/style/style/normal/vr/day/building.cfg index 642c8e9660..01cf71312b 100644 --- a/libraries/mapmodule/src/main/assets/style/style/normal/vr/day/building.cfg +++ b/libraries/mapmodule/src/main/assets/style/style/normal/vr/day/building.cfg @@ -1,18 +1,18 @@ -building.icon.path.type.6=/building/加油站.png;555555 //路径;颜色 -building.icon.path.type.30=/building/医院.png;555555 -building.icon.path.type.35=/building/警察局.png;555555 -building.icon.path.type.36=/building/邮局.png;555555 -building.icon.path.type.37=/building/市政府.png;555555 -building.icon.path.type.39=/building/法院.png;555555 -building.icon.path.type.40=/building/政府机构.png;555555 -building.icon.path.type.41=/building/社区活动中心.png;555555 -building.icon.path.type.42=/building/购物中心.png;555555 -building.icon.path.type.44=/building/银行.png;555555 -building.icon.path.type.66=/building/商业设施.png;555555 -building.icon.path.type.67=/building/展览馆.png;555555 -building.icon.path.type.68=/building/火车站.png;555555 -building.icon.path.type.69=/building/公交站.png;555555 -building.icon.path.type.71=/building/飞机场.png;555555 -building.icon.path.type.75=/building/紧急医疗服务.png;555555 -building.icon.path.type.99=/building/mogo.png;555555 \ No newline at end of file +building.icon.path.type.6=/building/加油站.png;465682 //路径;颜色 +building.icon.path.type.30=/building/医院.png;465682 +building.icon.path.type.35=/building/警察局.png;465682 +building.icon.path.type.36=/building/邮局.png;465682 +building.icon.path.type.37=/building/市政府.png;465682 +building.icon.path.type.39=/building/法院.png;465682 +building.icon.path.type.40=/building/政府机构.png;465682 +building.icon.path.type.41=/building/社区活动中心.png;465682 +building.icon.path.type.42=/building/购物中心.png;465682 +building.icon.path.type.44=/building/银行.png;465682 +building.icon.path.type.66=/building/商业设施.png;465682 +building.icon.path.type.67=/building/展览馆.png;465682 +building.icon.path.type.68=/building/火车站.png;465682 +building.icon.path.type.69=/building/公交站.png;465682 +building.icon.path.type.71=/building/飞机场.png;465682 +building.icon.path.type.75=/building/紧急医疗服务.png;465682 +building.icon.path.type.99=/building/mogo.png;465682 \ No newline at end of file diff --git a/libraries/mapmodule/src/main/assets/style/style/normal/vr/day/common.cfg b/libraries/mapmodule/src/main/assets/style/style/normal/vr/day/common.cfg index 94726723a3..6da84511e3 100644 --- a/libraries/mapmodule/src/main/assets/style/style/normal/vr/day/common.cfg +++ b/libraries/mapmodule/src/main/assets/style/style/normal/vr/day/common.cfg @@ -29,8 +29,8 @@ rsu.type.3=BCC3D0 //rsu颜色 selfCar.light=0.8,0.8,0.8;0.2,0.2,0.2;0.8,0.8,0.8;100.0 //自车 otherCar.light=0.7,0.7,0.7;0.1,0.1,0.1;0.3,0.3,0.3;11.0 //他车 others.light=0.7,0.7,0.7;0.1,0.1,0.1;0.6,0.6,0.6;12.0 //除自车和他车外的其他3d锚点 -fog=BFD9FD;30;70;0.8 //雾颜色,起始距离,结束距离,密度 -skybox.lookat=0;-13;10; 0;0;5; 0;1;0 //天空盒lookat参数 +fog=d0e4ff;40;80;0.8 //雾颜色,起始距离,结束距离,密度 +skybox.lookat=0;-13;8.5;0;0;3; 0;1;0 //天空盒lookat参数 skybox.proj=60;0.1;100 //天空盒fov,近平面,远平面 grayscale=#9EC1DFFF building.text.color=555555 @@ -46,8 +46,31 @@ building.tex.path=/hd_res/day_mode/zhuan.png divider.15.left.tex.path=/hd_res/day_mode/divider15_left.png divider.15.right.tex.path=/hd_res/day_mode/divider15_right.png skybox.2d.tex.path=/skyDay.png - - +road.isGradient=false +road.gradientColor=B5C8E6 +road.gradientColor_morning=B5C8E6 +road.gradientColor_daytime=B5C8E6 +road.gradientColor_night=B5C8E6 +greenbelt.isGradient=false +greenbelt.gradientColor=E5F0E8 +greenbelt.gradientColor_morning=E5F0E8 +greenbelt.gradientColor_daytime=E5F0E8 +greenbelt.gradientColor_night=E5F0E8 +road.isGradient=false +road.gradientColor=ffB5C8E6;00B5C8E6 +road.gradientColor_morning=00f2c3b1;fff2c3b1 +road.gradientColor_daytime=ffB5C8E6;00B5C8E6 +road.gradientColor_evening=00f2c3b1;fff2c3b1 +greenbelt.isGradient=false +greenbelt.gradientColor=ffE5F0E8;00E5F0E8 +greenbelt.gradientColor_morning=00f2c3b1;fff2c3b1 +greenbelt.gradientColor_daytime=ffE5F0E8;00E5F0E8 +greenbelt.gradientColor_evening=00f2c3b1;fff2c3b1 +plane.isGradient=false +plane.gradientColor=ffB5C8E6;00B5C8E6 +plane.gradientColor_morning=00f2c3b1;fff2c3b1 +plane.gradientColor_daytime=ffB5C8E6;00B5C8E6 +plane.gradientColor_evening=00f2c3b1;fff2c3b1 diff --git a/libraries/mapmodule/src/main/assets/style/style/normal/vr/night/building.cfg b/libraries/mapmodule/src/main/assets/style/style/normal/vr/night/building.cfg index 642c8e9660..c86405e0d6 100644 --- a/libraries/mapmodule/src/main/assets/style/style/normal/vr/night/building.cfg +++ b/libraries/mapmodule/src/main/assets/style/style/normal/vr/night/building.cfg @@ -1,18 +1,18 @@ -building.icon.path.type.6=/building/加油站.png;555555 //路径;颜色 -building.icon.path.type.30=/building/医院.png;555555 -building.icon.path.type.35=/building/警察局.png;555555 -building.icon.path.type.36=/building/邮局.png;555555 -building.icon.path.type.37=/building/市政府.png;555555 -building.icon.path.type.39=/building/法院.png;555555 -building.icon.path.type.40=/building/政府机构.png;555555 -building.icon.path.type.41=/building/社区活动中心.png;555555 -building.icon.path.type.42=/building/购物中心.png;555555 -building.icon.path.type.44=/building/银行.png;555555 -building.icon.path.type.66=/building/商业设施.png;555555 -building.icon.path.type.67=/building/展览馆.png;555555 -building.icon.path.type.68=/building/火车站.png;555555 -building.icon.path.type.69=/building/公交站.png;555555 -building.icon.path.type.71=/building/飞机场.png;555555 -building.icon.path.type.75=/building/紧急医疗服务.png;555555 -building.icon.path.type.99=/building/mogo.png;555555 \ No newline at end of file +building.icon.path.type.6=/building/加油站.png;e6e6e6 //路径;颜色 +building.icon.path.type.30=/building/医院.png;e6e6e6 +building.icon.path.type.35=/building/警察局.png;e6e6e6 +building.icon.path.type.36=/building/邮局.png;e6e6e6 +building.icon.path.type.37=/building/市政府.png;e6e6e6 +building.icon.path.type.39=/building/法院.png;e6e6e6 +building.icon.path.type.40=/building/政府机构.png;e6e6e6 +building.icon.path.type.41=/building/社区活动中心.png;e6e6e6 +building.icon.path.type.42=/building/购物中心.png;e6e6e6 +building.icon.path.type.44=/building/银行.png;e6e6e6 +building.icon.path.type.66=/building/商业设施.png;e6e6e6 +building.icon.path.type.67=/building/展览馆.png;e6e6e6 +building.icon.path.type.68=/building/火车站.png;e6e6e6 +building.icon.path.type.69=/building/公交站.png;e6e6e6 +building.icon.path.type.71=/building/飞机场.png;e6e6e6 +building.icon.path.type.75=/building/紧急医疗服务.png;e6e6e6 +building.icon.path.type.99=/building/mogo.png;e6e6e6 \ No newline at end of file diff --git a/libraries/mapmodule/src/main/assets/style/style/normal/vr/night/common.cfg b/libraries/mapmodule/src/main/assets/style/style/normal/vr/night/common.cfg index 036b6994cd..3aaff7b404 100644 --- a/libraries/mapmodule/src/main/assets/style/style/normal/vr/night/common.cfg +++ b/libraries/mapmodule/src/main/assets/style/style/normal/vr/night/common.cfg @@ -30,9 +30,9 @@ selfCar.light=0.6,0.6,0.6;0.1,0.1,0.1;0.6,0.6,0.6;12.0 //自车 otherCar.light=0.4,0.4,0.4;0.1,0.1,0.1;0.6,0.6,0.6;12.0 //他车 others.light=0.4,0.4,0.4;0.1,0.1,0.1;0.6,0.6,0.6;12.0 //除自车和他车外的其他3d锚点 fog=BFD9FD;35;70;0.8 //雾颜色,起始距离,结束距离,密度 -skybox.lookat=0;-13;8; 0;0;5; 0;1;0 //天空盒lookat参数 +skybox.lookat=0;-13;8.5;0;0;3; 0;1;0 //天空盒lookat参数 skybox.proj=60;0.1;100 //天空盒fov,近平面,远平面 -grayscale=#9EC1DFFF +grayscale=#BCCCDAFF building.text.color=0.8,0.8,0.8,1.0 building.text.size=100 station.text.color=0.0,0.0,1.0,1.0 @@ -46,6 +46,21 @@ building.tex.path=/hd_res/night_mode/zhuan.png divider.15.left.tex.path=/hd_res/night_mode/divider15_left.png divider.15.right.tex.path=/hd_res/night_mode/divider15_right.png skybox.2d.tex.path=/skyNight.png +road.isGradient=false +road.gradientColor=ffB5C8E6;00B5C8E6 +road.gradientColor_morning=00f2c3b1;fff2c3b1 +road.gradientColor_daytime=ffB5C8E6;00B5C8E6 +road.gradientColor_evening=00f2c3b1;fff2c3b1 +greenbelt.isGradient=false +greenbelt.gradientColor=ffE5F0E8;00E5F0E8 +greenbelt.gradientColor_morning=00f2c3b1;fff2c3b1 +greenbelt.gradientColor_daytime=ffE5F0E8;00E5F0E8 +greenbelt.gradientColor_evening=00f2c3b1;fff2c3b1 +plane.isGradient=false +plane.gradientColor=ffB5C8E6;00B5C8E6 +plane.gradientColor_morning=00f2c3b1;fff2c3b1 +plane.gradientColor_daytime=ffB5C8E6;00B5C8E6 +plane.gradientColor_evening=00f2c3b1;fff2c3b1 diff --git a/libraries/mapmodule/src/main/assets/style/style/normal/vr/taxi_day/alpha.cfg b/libraries/mapmodule/src/main/assets/style/style/normal/vr/taxi_day/alpha.cfg new file mode 100644 index 0000000000..0bb9ddc38e --- /dev/null +++ b/libraries/mapmodule/src/main/assets/style/style/normal/vr/taxi_day/alpha.cfg @@ -0,0 +1,50 @@ +alpha.tex.path.11.出口.0=/hd_res/taxi_day_mode/exit.png +alpha.tex.path.11.前方学校.1=/hd_res/taxi_day_mode/schoolZone_white.png +alpha.tex.path.11.前方学校.2=/hd_res/taxi_day_mode/schoolZone_yellow.png +alpha.tex.path.11.公交专用.0=/hd_res/taxi_day_mode/WithBusVertical.png +alpha.tex.path.11.潮汐车道.0=/hd_res/taxi_day_mode/ReversibleLane.png +alpha.tex.path.11.公交车道.0=/hd_res/taxi_day_mode/busLaneVertical.png +alpha.tex.path.11.公交车.0=/hd_res/taxi_day_mode/bus.png +alpha.tex.path.11.快速公交专用线.1=/hd_res/taxi_day_mode/bus_Rapid_white.png +alpha.tex.path.11.快速公交专用线.2=/hd_res/taxi_day_mode/bus_Rapid_yellow.png +alpha.tex.path.11.借道区.1=/hd_res/taxi_day_mode/throughWordsV_white.png +alpha.tex.path.11.借道区.2=/hd_res/taxi_day_mode/throughWordsV_yellow.png +alpha.tex.path.11.公交停靠.0=/hd_res/taxi_day_mode/busStop.png +alpha.tex.path.11.警务专用.0=/hd_res/taxi_day_mode/policeSpecialV.png +alpha.tex.path.11.礼让行人.1=/hd_res/taxi_day_mode/comity_PedestrianShu.png +alpha.tex.path.11.礼让行人.2=/hd_res/taxi_day_mode/comityPedestrianCShu.png +alpha.tex.path.11.人行道.0=/hd_res/taxi_day_mode/sideRoad.png +alpha.tex.path.11.观光车专用道.0=/hd_res/taxi_day_mode/tourRoad.png +alpha.tex.path.12.BATTERY.0=/hd_res/taxi_day_mode/battery.png +alpha.tex.path.12.WALK.0=/hd_res/taxi_day_mode/walk.png +alpha.tex.path.12.车让人.0=/hd_res/taxi_day_mode/carpeople.png +alpha.tex.path.12.公交专用.0=/hd_res/taxi_day_mode/WithBusAcross.png +alpha.tex.path.12.公交车道.0=/hd_res/taxi_day_mode/busLaneAcross.png +alpha.tex.path.12.礼让行人.1=/hd_res/taxi_day_mode/comity_Pedestrian.png +alpha.tex.path.12.礼让行人.2=/hd_res/taxi_day_mode/comityPedestrianC.png +alpha.tex.path.12.停.0=/hd_res/taxi_day_mode/stop.png +alpha.tex.path.12.请勿越线.2=/hd_res/taxi_day_mode/noCrossLine.png +alpha.tex.path.22.7-22.0=/hd_res/taxi_day_mode/7-22.png +alpha.tex.path.22.7-9.1=/hd_res/taxi_day_mode/7-9_white.png +alpha.tex.path.22.7-9.2=/hd_res/taxi_day_mode/7-9_yellow.png +alpha.tex.path.22.17-19.1=/hd_res/taxi_day_mode/17-19_white.png +alpha.tex.path.22.17-19.2=/hd_res/taxi_day_mode/17-19_yellow.png +alpha.tex.path.22.16-19.1=/hd_res/taxi_day_mode/16-19_white.png +alpha.tex.path.22.16-19.2=/hd_res/taxi_day_mode/16-19_yellow.png +alpha.tex.path.22.17-20.1=/hd_res/taxi_day_mode/17-20_white.png +alpha.tex.path.22.17-20.2=/hd_res/taxi_day_mode/17-20_yellow.png +alpha.tex.path.22.6-20.0=/hd_res/taxi_day_mode/6-20_white.png +alpha.tex.path.22.6-22.0=/hd_res/taxi_day_mode/6-22_white.png +alpha.tex.path.22.7:30-9:30.1=/hd_res/taxi_day_mode/1730-1930-white.png +alpha.tex.path.22.7:30-9:30.2=/hd_res/taxi_day_mode/1730-1930-yellow.png +alpha.tex.path.22.7-10.0=/hd_res/taxi_day_mode/7-10-speed.png +alpha.tex.path.22.16:00-18:00.1=/hd_res/taxi_day_mode/16_18.png +alpha.tex.path.31.60-80.0=/hd_res/taxi_day_mode/60-80-speed.png +alpha.tex.path.31.80-100.0=/hd_res/taxi_day_mode/80-100-speed.png +alpha.tex.path.31.100-120.0=/hd_res/taxi_day_mode/100-120-speed.png +alpha.tex.path.31.60-100.0=/hd_res/taxi_day_mode/60-100-speed.png +alpha.tex.path.31.90-120.0=/hd_res/taxi_day_mode/90-120-speed.png +alpha.tex.path.32.80.0=/hd_res/taxi_day_mode/80-speed.png +alpha.tex.path.32.60.0=/hd_res/taxi_day_mode/60-speed.png +alpha.tex.path.32.40.1=/hd_res/taxi_day_mode/40-speed-white.png +alpha.tex.path.32.40.2=/hd_res/taxi_day_mode/40-speed-yellow.png \ No newline at end of file diff --git a/libraries/mapmodule/src/main/assets/style/style/normal/vr/taxi_day/arrow.cfg b/libraries/mapmodule/src/main/assets/style/style/normal/vr/taxi_day/arrow.cfg new file mode 100644 index 0000000000..373a161b05 --- /dev/null +++ b/libraries/mapmodule/src/main/assets/style/style/normal/vr/taxi_day/arrow.cfg @@ -0,0 +1,65 @@ +arrow.tex.path.201=/hd_res/taxi_day_mode/gostraight.png +arrow.tex.path.202=/hd_res/taxi_day_mode/gostraightleft.png +arrow.tex.path.203=/hd_res/taxi_day_mode/gostraightrightturn.png +arrow.tex.path.204=/hd_res/taxi_day_mode/gostraightleftround.png +arrow.tex.path.220=/hd_res/taxi_day_mode/gostraightrightround.png +arrow.tex.path.205=/hd_res/taxi_day_mode/leftturn.png +arrow.tex.path.206=/hd_res/taxi_day_mode/leftleftround.png +arrow.tex.path.207=/hd_res/taxi_day_mode/leftwaitturn.png +arrow.tex.path.208=/hd_res/taxi_day_mode/rightturn.png +arrow.tex.path.209=/hd_res/taxi_day_mode/rightwaitturn.png +arrow.tex.path.210=/hd_res/taxi_day_mode/leftrightturn.png +arrow.tex.path.211=/hd_res/taxi_day_mode/leftround.png +arrow.tex.path.212=/hd_res/taxi_day_mode/noleftturn.png +arrow.tex.path.215=/hd_res/taxi_day_mode/gostraightleftright.png +arrow.tex.path.402=/hd_res/taxi_day_mode/bicycle_cross_right.png +arrow.tex.path.412=/hd_res/taxi_day_mode/bicycle_vertical_right.png +arrow.tex.path.408=/hd_res/taxi_day_mode/bicycle_vertical_left.png +arrow.tex.path.410=/hd_res/taxi_day_mode/bicycle_cross_left.png +arrow.tex.path.411=/hd_res/taxi_day_mode/motorVehiclesC.png +arrow.tex.path.413=/hd_res/taxi_day_mode/bicycle_vertical_LL.png +arrow.tex.path.404=/hd_res/taxi_day_mode/bicycle_vertical_right_down.png +arrow.tex.path.508=/hd_res/taxi_day_mode/Rhombus.png +arrow.tex.path.509=/hd_res/taxi_day_mode/Triangle.png +arrow.tex.path.511.1=/hd_res/taxi_day_mode/SpeedBump1_white.png +arrow.tex.path.511.2=/hd_res/taxi_day_mode/SpeedBump1_yellow.png +arrow.tex.path.511.4=/hd_res/taxi_day_mode/SpeedBump1_red.png +arrow.tex.path.501.1=/hd_res/taxi_day_mode/SpeedBump2_white.png +arrow.tex.path.501.2=/hd_res/taxi_day_mode/SpeedBump2_yellow.png +arrow.tex.path.501.4=/hd_res/taxi_day_mode/SpeedBump2_red.png +arrow.tex.path.502.1=/hd_res/taxi_day_mode/SpeedBump3_white.png +arrow.tex.path.502.2=/hd_res/taxi_day_mode/SpeedBump3_yellow.png +arrow.tex.path.502.4=/hd_res/taxi_day_mode/SpeedBump3_red.png +arrow.tex.path.512.1=/hd_res/taxi_day_mode/SpeedBump4_white.png +arrow.tex.path.512.2=/hd_res/taxi_day_mode/SpeedBump4_yellow.png +arrow.tex.path.512.4=/hd_res/taxi_day_mode/SpeedBump4_red.png +arrow.tex.path.517.4=/hd_res/taxi_day_mode/SpeedBump5_red.png +arrow.tex.path.517.1=/hd_res/taxi_day_mode/SpeedBump5_white.png +arrow.tex.path.517.2=/hd_res/taxi_day_mode/SpeedBump5_yellow.png +arrow.tex.path.603=/hd_res/taxi_day_mode/BigSquareForbidArea.png +arrow.tex.path.604=/hd_res/taxi_day_mode/SmaSquareForbidArea.png +arrow.tex.path.605=/hd_res/taxi_day_mode/BigRectForbidArea.png +arrow.tex.path.606=/hd_res/taxi_day_mode/SmaRectForbidArea.png +arrow.tex.path.513.1=/hd_res/taxi_day_mode/UnSpeedBump1_white.png +arrow.tex.path.513.2=/hd_res/taxi_day_mode/UnSpeedBump1_yellow.png +arrow.tex.path.513.4=/hd_res/taxi_day_mode/UnSpeedBump1_red.png +arrow.tex.path.514.1=/hd_res/taxi_day_mode/UnSpeedBump2_white.png +arrow.tex.path.514.2=/hd_res/taxi_day_mode/UnSpeedBump2_yellow.png +arrow.tex.path.514.4=/hd_res/taxi_day_mode/UnSpeedBump2_red.png +arrow.tex.path.515.1=/hd_res/taxi_day_mode/UnSpeedBump3_white.png +arrow.tex.path.515.2=/hd_res/taxi_day_mode/UnSpeedBump3_yellow.png +arrow.tex.path.515.4=/hd_res/taxi_day_mode/UnSpeedBump3_red.png +arrow.tex.path.516.1=/hd_res/taxi_day_mode/UnSpeedBump4_white.png +arrow.tex.path.516.2=/hd_res/taxi_day_mode/UnSpeedBump4_yellow.png +arrow.tex.path.516.4=/hd_res/taxi_day_mode/UnSpeedBump4_red.png +arrow.tex.path.518.4=/hd_res/taxi_day_mode/UnSpeedBump5_red.png +arrow.tex.path.518.1=/hd_res/taxi_day_mode/UnSpeedBump5_white.png +arrow.tex.path.518.2=/hd_res/taxi_day_mode/UnSpeedBump5_yellow.png +arrow.tex.path.719=/hd_res/taxi_day_mode/busTransitLaneV.png +arrow.tex.path.721=/hd_res/taxi_day_mode/hov.png +arrow.tex.path.608=/hd_res/taxi_day_mode/noStopMarking.png +arrow.tex.path.219=/hd_res/taxi_day_mode/noLeftOrTurn.png +arrow.tex.path.722=/hd_res/taxi_day_mode/ParkingLotSign.png +arrow.tex.path.415=/hd_res/taxi_day_mode/415_1.png +arrow.tex.path.416=/hd_res/taxi_day_mode/416.png +arrow.tex.path.214=/hd_res/taxi_day_mode/noTurn.png \ No newline at end of file diff --git a/libraries/mapmodule/src/main/assets/style/style/normal/vr/taxi_day/building.cfg b/libraries/mapmodule/src/main/assets/style/style/normal/vr/taxi_day/building.cfg new file mode 100644 index 0000000000..01cf71312b --- /dev/null +++ b/libraries/mapmodule/src/main/assets/style/style/normal/vr/taxi_day/building.cfg @@ -0,0 +1,18 @@ + +building.icon.path.type.6=/building/加油站.png;465682 //路径;颜色 +building.icon.path.type.30=/building/医院.png;465682 +building.icon.path.type.35=/building/警察局.png;465682 +building.icon.path.type.36=/building/邮局.png;465682 +building.icon.path.type.37=/building/市政府.png;465682 +building.icon.path.type.39=/building/法院.png;465682 +building.icon.path.type.40=/building/政府机构.png;465682 +building.icon.path.type.41=/building/社区活动中心.png;465682 +building.icon.path.type.42=/building/购物中心.png;465682 +building.icon.path.type.44=/building/银行.png;465682 +building.icon.path.type.66=/building/商业设施.png;465682 +building.icon.path.type.67=/building/展览馆.png;465682 +building.icon.path.type.68=/building/火车站.png;465682 +building.icon.path.type.69=/building/公交站.png;465682 +building.icon.path.type.71=/building/飞机场.png;465682 +building.icon.path.type.75=/building/紧急医疗服务.png;465682 +building.icon.path.type.99=/building/mogo.png;465682 \ No newline at end of file diff --git a/libraries/mapmodule/src/main/assets/style/style/normal/vr/taxi_day/common.cfg b/libraries/mapmodule/src/main/assets/style/style/normal/vr/taxi_day/common.cfg new file mode 100644 index 0000000000..b17a7d9913 --- /dev/null +++ b/libraries/mapmodule/src/main/assets/style/style/normal/vr/taxi_day/common.cfg @@ -0,0 +1,68 @@ +backGround=D9E9FF //背景色 +road=C4D8F5 //路面颜色 +arrow.color.fac=0.95 //箭头颜色因子 +alphaNumeric.color.fac=1.0 //地标颜色因子 +zebra.color.fac=0.98 //斑马线颜色因子 +spotLight=2.5;0;1 //聚光灯 半径;亮度;偏移 +shadow=4C7793AB //阴影颜色 +greenBelt=D0E6EC;D9EAF4 //绿化带 底部颜色;顶部颜色 +dividerLine=E3F2FF;E1E2C4;1.0 //白色;黄色;颜色因子 +pole=9FB6D6;9FB6D6 //灯杆渐变颜色 +guardBar=CCE0FA;C4D9F7;CEE1FB //隔离带颜色 底,中, 顶 +roadPile=E6D4A1;7F96B5;B3C4DC //路桩颜色 +bridgePier=d2d6e4;979aa4 //桥墩颜色 +cable=D2E3FC;D2E3FC;D2E3FC;D2E3FC //电缆颜色1;电缆颜色2;光缆颜色1;光缆颜色2 +area.type.2=D0E7DD //绿地颜色 +area.type.3.color.pure=B5DFF8 //水系颜色 +area.type.3.color.gradient=C5E5FE;7CB0E2 //水系颜色,渐变 +area.type.3.ring.width=50 //水系环宽度 +area.type.4=D1E1F8 //路面铺装颜色 +area.type.101=D9E9FF //区域块颜色 +regional=D1E1F8 //人行步道颜色 +building=BBCEE9;E0EDFC //建筑物底部颜色;顶部颜色 +camera=9FB6D6 //摄像头颜色 +trafficLight=9FB6D6 //交通灯颜色 +rsu.type.1=9FB6D6 //雷达颜色 +rsu.type.2=9FB6D6 //mec颜色 +rsu.type.3=9FB6D6 //rsu颜色 +//光照 环境光;漫反射;高光;高光的光泽度 +selfCar.light=0.8,0.8,0.8;0.2,0.2,0.2;0.1,0.1,0.1;100.0 //自车 +otherCar.light=0.7,0.7,0.7;0.02,0.02,0.02;0.15,0.15,0.15;11.0 //他车 +others.light=0.7,0.7,0.7;0.1,0.1,0.1;0.6,0.6,0.6;12.0 //除自车和他车外的其他3d锚点 +fog=d0e4ff;40;80;0.8 //雾颜色,起始距离,结束距离,密度 +skybox.lookat=0;-13;8.5;0;0;3; 0;1;0 //天空盒lookat参数 +skybox.proj=60;0.1;100 //天空盒fov,近平面,远平面 +grayscale=#A3C4EAFF +building.text.color=555555 +building.text.size=100 +station.text.color=0.0,0.0,1.0,1.0 +station.text.size=150 +cable.wave.color=0.5,0.8,1.0,1.0 +cable.wave.vel=1.8 +road.tex.path=/hd_res/taxi_day_mode/road.png +zebra.tex.path=/hd_res/taxi_day_mode/zebra.png +plane.tex.path=/hd_res/taxi_day_mode/plane.png +building.tex.path=/hd_res/taxi_day_mode/zhuan.png +divider.15.left.tex.path=/hd_res/taxi_day_mode/divider15_left.png +divider.15.right.tex.path=/hd_res/taxi_day_mode/divider15_right.png +skybox.2d.tex.path=/skyDay.png +road.isGradient=true +road.gradientColor=66B5C8E6;00B5C8E6 +road.gradientColor_morning=00f2c3b1;66f2c3b1 +road.gradientColor_daytime=66B5C8E6;00B5C8E6 +road.gradientColor_evening=00f2c3b1;66f2c3b1 +greenbelt.isGradient=true +greenbelt.gradientColor=66E5F0E8;00E5F0E8 +greenbelt.gradientColor_morning=00f2c3b1;66f2c3b1 +greenbelt.gradientColor_daytime=66E5F0E8;00E5F0E8 +greenbelt.gradientColor_evening=00f2c3b1;66f2c3b1 +plane.isGradient=true +plane.gradientColor=66B5C8E6;00B5C8E6 +plane.gradientColor_morning=00f2c3b1;66f2c3b1 +plane.gradientColor_daytime=66B5C8E6;00B5C8E6 +plane.gradientColor_evening=00f2c3b1;66f2c3b1 + + + + + diff --git a/libraries/mapmodule/src/main/java/com/autonavi/nge/map/MapEngine.kt b/libraries/mapmodule/src/main/java/com/autonavi/nge/map/MapEngine.kt index fbc8938589..ad3946f1f3 100644 --- a/libraries/mapmodule/src/main/java/com/autonavi/nge/map/MapEngine.kt +++ b/libraries/mapmodule/src/main/java/com/autonavi/nge/map/MapEngine.kt @@ -1025,6 +1025,10 @@ class MapEngine { setStyleName("night") else if(styleMode== MapAutoApi.MAP_STYLE_DAY_VR) setStyleName("day") + else if(styleMode== MapAutoApi.MAP_STYLE_DAY_VR_BUS) + setStyleName("bus_day") + else if(styleMode== MapAutoApi.MAP_STYLE_DAY_VR_TAXI) + setStyleName("taxi_day") } private external fun loadJni(projectDir: String, mapView: MapView?,assetManager: AssetManager?): Long diff --git a/libraries/mapmodule/src/main/java/com/autonavi/nge/map/MapView.kt b/libraries/mapmodule/src/main/java/com/autonavi/nge/map/MapView.kt index 9b169862a5..c162267d53 100644 --- a/libraries/mapmodule/src/main/java/com/autonavi/nge/map/MapView.kt +++ b/libraries/mapmodule/src/main/java/com/autonavi/nge/map/MapView.kt @@ -596,7 +596,7 @@ class MapView(context: Context, private val mMapStyleParams: IMapStyleParams, pr } if (isRenderFirst) { isRenderFirst = false - if(mMapStyleParams.getStyleMode() == MapAutoApi.MAP_STYLE_NIGHT_VR || mMapStyleParams.getStyleMode() == MapAutoApi.MAP_STYLE_DAY_VR) { + if(mMapStyleParams.getStyleMode() >= MapAutoApi.MAP_STYLE_NIGHT_VR) { mMapController?.setMapViewVisualAngle(mMapStyleParams.getVrAngleDefaultMode()) } mHandler.sendEmptyMessage(INIT_COMPLETE) @@ -729,7 +729,7 @@ class MapView(context: Context, private val mMapStyleParams: IMapStyleParams, pr mMapEngine.setScreenToOriginDis(mMapStyleParams.getCarPosition()) - if (mMapStyleParams.getStyleMode() == MapAutoApi.MAP_STYLE_NIGHT_VR || mMapStyleParams.getStyleMode() == MapAutoApi.MAP_STYLE_DAY_VR) { + if (mMapStyleParams.getStyleMode() >= MapAutoApi.MAP_STYLE_NIGHT_VR) { if (DEBUG) { Log.i(TAG, "mapop-surfaceop----onSurfaceCreated:,Vr") } @@ -779,7 +779,7 @@ class MapView(context: Context, private val mMapStyleParams: IMapStyleParams, pr return true } if (isCanZoom) { - if(mMapStyleParams.isSwitchViewAngle() && (mMapStyleParams.getStyleMode() == MapAutoApi.MAP_STYLE_NIGHT_VR || mMapStyleParams.getStyleMode() == MapAutoApi.MAP_STYLE_DAY_VR)){ + if(mMapStyleParams.isSwitchViewAngle() && (mMapStyleParams.getStyleMode() >= MapAutoApi.MAP_STYLE_NIGHT_VR)){ var type = mMapStyleParams.getVrAngleDefaultMode() when(mMapStyleParams.getVrAngleMode()){ mMapStyleParams.getVrAngleDefaultMode()->{ @@ -1083,13 +1083,13 @@ class MapView(context: Context, private val mMapStyleParams: IMapStyleParams, pr private var isScroll = true //可以斜滑 - private var isFling = false + private var isFling = true //可以旋转 - private var isRotate = false + private var isRotate = true //可以缩放 - private var isCanZoom = false + private var isCanZoom = true private var isVr = true @@ -1151,10 +1151,10 @@ class MapView(context: Context, private val mMapStyleParams: IMapStyleParams, pr } fun onMapFocusChanging() { -// if (DEBUG) { -// Log.i(TAG, "mapop--onMapFocusChanging") -// } -// mHandler.sendEmptyMessage(FOCUS_CHANGE) + if (DEBUG) { + Log.i(TAG, "mapop--onMapFocusChanging") + } + mHandler.sendEmptyMessage(FOCUS_CHANGE) } fun onMapZoomChanging(zoomIndex: Float) { @@ -1168,23 +1168,23 @@ class MapView(context: Context, private val mMapStyleParams: IMapStyleParams, pr } fun onMapRAngleChanging(angle:Float) { -// if (DEBUG) { -// Log.i(TAG, "mapop--onMapRAngleChanging") -// } -// val msg = Message.obtain() -// msg.what = ROTATE_CHANGE -// msg.obj = angle -// mHandler.sendMessage(msg) + if (DEBUG) { + Log.i(TAG, "mapop--onMapRAngleChanging:${angle}") + } + val msg = Message.obtain() + msg.what = ROTATE_CHANGE + msg.obj = angle + mHandler.sendMessage(msg) } fun onMapDAngleChanging(angle:Float) { -// if (DEBUG) { -// Log.i(TAG, "mapop--onMapDAngleChanging:${angle}") -// } -// val msg = Message.obtain() -// msg.what = DAngle_CHANGE -// msg.obj = angle -// mHandler.sendMessage(msg) + if (DEBUG) { + Log.i(TAG, "mapop--onMapDAngleChanging:${angle}") + } + val msg = Message.obtain() + msg.what = DAngle_CHANGE + msg.obj = angle + mHandler.sendMessage(msg) } override fun loadP( diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/map/MapController.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/map/MapController.kt index 1e828eadd5..61b3a263e2 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/map/MapController.kt +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/map/MapController.kt @@ -993,13 +993,14 @@ class MapController(private var context: Context?, private val mMapView: IMapVie } mMapStyleParams.setVrPerspectiveMode(arrays[0]) mMapStyleParams.setVrEyeHeight(arrays[1]) - if(mMapStyleParams.getVrAngleMode()==ConstantExt.MAP_STYLE_VR_BRIDGE){ - var fac = 100.0f/(arrays[0]*8f)/20f - var lookAtZ = alt + 5.0f - var cameraHeight = arrays[2] + lookAtZ - arrays[2]=cameraHeight*fac; - mMapView.getMapEngine().setScreenToOriginDis(lookAtZ*fac) - } + //底层读取中心线的高度,暂时不用轨迹的高度 +// if(mMapStyleParams.getVrAngleMode()==ConstantExt.MAP_STYLE_VR_BRIDGE){ +// var fac = 100.0f/(arrays[0]*8f)/20f +// var lookAtZ = alt + 5.0f +// var cameraHeight = arrays[2] + lookAtZ +// arrays[2]=cameraHeight*fac; +// mMapView.getMapEngine().setScreenToOriginDis(lookAtZ*fac) +// } if (lastAnimZoom == arrays[0] && lastOverLookAngle == arrays[1] && lastEyeHeight == arrays[2]) { mMapView.getMapEngine() @@ -1371,7 +1372,7 @@ class MapController(private var context: Context?, private val mMapView: IMapVie -1 ) delay(1000) - mMapView.getMapEngine().setCfgKeyVal("isSkyBoxFastChange", "disable") + //mMapView.getMapEngine().setCfgKeyVal("isSkyBoxFastChange", "disable") mMapView.getMapEngine().setCfgKeyVal(ConstantExt.FOG, "enable") mMapView.getMapEngine().setCfgKeyVal(ConstantExt.SKYBOX, "enable") } diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/panel/PanelBtnLocation.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/panel/PanelBtnLocation.kt index 70bb50915c..696c999c86 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/panel/PanelBtnLocation.kt +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/panel/PanelBtnLocation.kt @@ -56,7 +56,7 @@ class PanelBtnLocation(context: Context?,private val mMapController: IMapControl setPos(0, 20, 10, 25) setMyGravity(Gravity.BOTTOM or Gravity.RIGHT) val style = mMapController.getMapStyleParams().getStyleMode() - if(style == MapAutoApi.MAP_STYLE_DAY || style == MapAutoApi.MAP_STYLE_DAY_VR){ + if(style == MapAutoApi.MAP_STYLE_DAY || style >= MapAutoApi.MAP_STYLE_DAY_VR){ btn_pos.setImageResource(R.mipmap.icon_location_day) }else{ btn_pos.setImageResource(R.mipmap.icon_location_night) diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/panel/PanelZoom.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/panel/PanelZoom.kt index 8b1c8f866e..977111b9c8 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/panel/PanelZoom.kt +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/panel/PanelZoom.kt @@ -51,7 +51,7 @@ class PanelZoom(context: Context?,private val mMapController:IMapController) : P setMyGravity(Gravity.RIGHT or Gravity.BOTTOM) setPos(0, 165, 0, 25) val style = mMapController.getMapStyleParams().getStyleMode() - if(style == MapAutoApi.MAP_STYLE_DAY || style == MapAutoApi.MAP_STYLE_DAY_VR){ + if(style == MapAutoApi.MAP_STYLE_DAY || style >= MapAutoApi.MAP_STYLE_DAY_VR){ img_zoom_in.setImageResource(R.mipmap.icon_zoom_in_day) img_zoom_out.setImageResource(R.mipmap.icon_zoom_out_day) }else{ diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/utils/ColorUtil.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/utils/ColorUtil.kt new file mode 100644 index 0000000000..9e3ed3428f --- /dev/null +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/utils/ColorUtil.kt @@ -0,0 +1,24 @@ +package com.zhidaoauto.map.sdk.inner.utils + + +object ColorUtil { + fun getColor(segments: List>): List? { + val gradientColors = mutableListOf() + + for (i in 0 until segments.size - 1) { + val (startPercent, startColor) = segments[i] + val (endPercent, endColor) = segments[i + 1] + + for (j in startPercent until endPercent step 10) { + val percent = (j - startPercent).toFloat() / (endPercent - startPercent).toFloat() + val interpolatedAlpha= startColor + (endColor - startColor) * percent + gradientColors.add(interpolatedAlpha.toInt()) + } + } + + // Add the last color + gradientColors.add(segments.last().second) + + return gradientColors + } +} \ No newline at end of file diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/MapAutoApi.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/MapAutoApi.kt index 88170ef2b1..3f63097744 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/MapAutoApi.kt +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/MapAutoApi.kt @@ -53,10 +53,8 @@ object MapAutoApi { const val MAP_STYLE_NIGHT_NAV = 4 //夜间导航模式 const val MAP_STYLE_NIGHT_VR = 5 //夜间VR模式 const val MAP_STYLE_DAY_VR = 6 //白天VR - const val MAP_STYLE_VR_ROAM = 7 //漫游模式 - const val MAP_STYLE_VR_TRANS = 8//过渡模式 - const val MAP_STYLE_VR_ERHAI_B2 = 9//洱海模式 - const val MAP_STYLE_VR_SKY_BOX = 10 //天空盒模式 + const val MAP_STYLE_DAY_VR_BUS = 7 //小巴车白天VR + const val MAP_STYLE_DAY_VR_TAXI = 8 //TAXI白天VR const val MAP_STYLE_VR_ANGLE_NEAR = 0 const val MAP_STYLE_VR_ANGLE_MIDDLE = 1 @@ -65,6 +63,11 @@ object MapAutoApi { const val MAP_STYLE_VR_ANGLE_TOP = 4 const val MAP_STYLE_VR_ANGLE_CROSS = 5 const val MAP_STYLE_VR_ANGLE_MIDDLE_XIAOBA = 6 + const val MAP_STYLE_VR_ROAM = 7 //漫游模式 + const val MAP_STYLE_VR_TRANS = 8//过渡模式 + const val MAP_STYLE_VR_ERHAI_B2 = 9//洱海模式 + const val MAP_STYLE_VR_SKY_BOX = 10 //天空盒模式 + const val ROAM_DIS_1KM = 1000f diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/location/MyLocationStyle.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/location/MyLocationStyle.kt index 368431d0a2..b1fbe14624 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/location/MyLocationStyle.kt +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/location/MyLocationStyle.kt @@ -44,7 +44,7 @@ class MyLocationStyle( private var locationCount = 0 private var is3D: Boolean = false private var carId: Int = 0 - private var isDisplayAnim: Boolean = false + private var isDisplayAnim: Boolean = true private var mMarker: Marker? = null private var lastExecuteTime = -1L @@ -76,7 +76,7 @@ class MyLocationStyle( init { car3DResId = mMapStyleParams?.getLocationIcon3DRes() ?: R.raw.car carResId = mMapStyleParams?.getLocationIconRes() ?: R.mipmap.map_custom_self_car_night - isDisplayAnim = mMapStyleParams?.isDisplayAnim()?: false + isDisplayAnim = mMapStyleParams?.isDisplayAnim()?: true } fun getSelfMarker(): Marker? { @@ -90,7 +90,7 @@ class MyLocationStyle( if (isDisplayAnim) { mMarker?.getMarkeOptions()?.let { it.animMarkerRes(guangquanResId, mMapController).animWaitFrame(animWaitFrame) - .period(animPeriod) + .period(animPeriod).animScale(0.85f) mMarker?.setMarkerOptions(it) } } else { @@ -181,7 +181,7 @@ class MyLocationStyle( if (isDisplayAnim) { markerOptions?.animWaitFrame(animWaitFrame)?.period(animPeriod) - ?.animType(1)?.anchorType(1) + ?.animType(1)?.anchorType(1)?.animScale(0.85f) markerOptions?.animMarkerRes(guangquanResId, mMapController) } else { //待增加删除之前动画模型的逻辑 @@ -230,6 +230,7 @@ class MyLocationStyle( .animType(1) .anchorType(1) .animWaitFrame(animWaitFrame) + .animScale(0.85f) .period(animPeriod) if (isDisplayAnim) { options.animMarkerRes(guangquanResId, mMapController) diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/marker/Marker.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/marker/Marker.kt index ff584aed22..d62723fef6 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/marker/Marker.kt +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/marker/Marker.kt @@ -118,6 +118,13 @@ public class Marker(private var markerOptions: MarkerOptions,private var mMapCon mMapController?.updateAnchorProperty(id,"scale","${markerOptions?.scale ?: scale}") } + + fun setAnimScale(animScale: Float) { + markerOptions.animScale(animScale) + mMapController?.updateAnchorProperty(id,"animScale","${markerOptions?.animScale ?: animScale}") + } + + fun getClickable(): Boolean { return markerOptions.isClickable()!! } diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/marker/MarkerOptions.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/marker/MarkerOptions.kt index dd4fa0fc03..f8fd225863 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/marker/MarkerOptions.kt +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/marker/MarkerOptions.kt @@ -120,6 +120,8 @@ class MarkerOptions { var averageFlag: Int = 1 + var animScale = 1f + constructor(mapController: IMapController?) { this.id = mapController?.getRecycleId() ?: UUID.randomUUID().toString() @@ -148,6 +150,7 @@ class MarkerOptions { markerInfoName ="" controlAngle = false vrIcon = false + animScale = 1f icons.clear() } @@ -588,6 +591,11 @@ class MarkerOptions { return this } + fun animScale(animScale: Float): MarkerOptions{ + this.animScale = animScale + return this + } + fun getPosition(): LonLatPoint? { return originLonLatPoint } diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/marker/MarkerSimpleData.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/marker/MarkerSimpleData.kt index fd59cefb33..74d6e8dfbe 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/marker/MarkerSimpleData.kt +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/marker/MarkerSimpleData.kt @@ -26,7 +26,7 @@ class MarkerSimpleData { var text: String = "" //状态 var status: Int = 0 - //置灰 + //置灰 0 不置灰 1 置灰 var grayScale: Int = 0 diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/poyline/PolylineOptions.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/poyline/PolylineOptions.kt index 5d29f02733..021bc7a8d2 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/poyline/PolylineOptions.kt +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/poyline/PolylineOptions.kt @@ -75,6 +75,8 @@ class PolylineOptions { private var isBright = false + private var isArrow = false + constructor(mapController: IMapController?){ this.mMapController = mapController id = UUID.randomUUID().toString() @@ -86,7 +88,14 @@ class PolylineOptions { this.lineWidth = lineWidth.toFloat() this.lonLatPoints = lonLatPoints } + fun setIsArrow(b: Boolean): PolylineOptions{ + this.isArrow = b + return this + } + fun getIsArrow(): Boolean{ + return isArrow + } fun color(color: Int): PolylineOptions{ this.color = color return this @@ -306,6 +315,7 @@ class PolylineOptions { ", useTexture=" + useTexture + ", maxIndex=" + maxIndex + ", isFacade=" + isFacade + + ", isArrow=" + isArrow + '}' } } \ No newline at end of file diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/tools/MapTools.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/tools/MapTools.kt index c10727886d..956e29fd73 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/tools/MapTools.kt +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/tools/MapTools.kt @@ -7,6 +7,7 @@ import com.zhidaoauto.map.data.point.LonLatPoint import com.zhidaoauto.map.sdk.inner.CompileConfig.DEBUG import com.zhidaoauto.map.sdk.inner.abs.IMapController import com.zhidaoauto.map.sdk.inner.proxy.CommonProxy +import com.zhidaoauto.map.sdk.inner.utils.ColorUtil import com.zhidaoauto.map.sdk.inner.utils.MathUtils import kotlin.math.abs import kotlin.math.absoluteValue @@ -314,4 +315,8 @@ object MapTools { return MathUtils.isInRegion(lon, lat, list) } + fun getColorAlpha(segments: List>): List?{ + return ColorUtil.getColor(segments) + } + } \ No newline at end of file diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/tools/TaskManager.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/tools/TaskManager.kt index 5691c863ef..ce9bf7ebb6 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/tools/TaskManager.kt +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/tools/TaskManager.kt @@ -457,7 +457,7 @@ class TaskManager private constructor() { val array = (trackStr + trackStr1).split(",") val list = ArrayList() for( i in 0 until array.size step 2){ - list.add(LonLatPoint(array[i].toDouble(),array[i+1].toDouble())) + list.add(LonLatPoint(array[i].toDoubleOrNull()?:0.0,array[i+1].toDoubleOrNull()?:0.0)) } mapAutoView.getMapAutoViewHelper()?.setRoamTrajectory(list) } @@ -680,8 +680,8 @@ class TaskManager private constructor() { if (it.status == 1) { RoadHelper.getInstance() ?.getCrossRoadById( - it.tile_id.toInt(), - it.cross_id.toLong(), + it.tile_id.toIntOrNull()?:1, + it.cross_id.toLongOrNull()?:1L, object : IResult> { override fun result( @@ -719,7 +719,7 @@ class TaskManager private constructor() { }) } - monitorGetZebraLine(lonlatPoint, mapAutoView) +// monitorGetZebraLine(lonlatPoint, mapAutoView) } fun monitorDelLine() { @@ -820,9 +820,9 @@ class TaskManager private constructor() { while (buffreader != null && buffreader.readLine().also { line = it } != null) { val lines = line!!.split(",") val lonLatPoint = LonLatPoint() - lonLatPoint.longitude = lines[1].trim().toDouble() - lonLatPoint.latitude = lines[2].trim().toDouble() - lonLatPoint.angle = lines[4].trim().toDouble() + lonLatPoint.longitude = lines[1].trim().toDoubleOrNull()?:0.0 + lonLatPoint.latitude = lines[2].trim().toDoubleOrNull()?:0.0 + lonLatPoint.angle = lines[4].trim().toDoubleOrNull()?:0.0 list.add(lonLatPoint) } trackMap[index] = list @@ -876,17 +876,17 @@ class TaskManager private constructor() { var angle: Double var type: Int if (i == 0) { - id = other[1].trim().toLong() - lon = other[2].trim().toDouble() - lat = other[3].trim().toDouble() - angle = other[5].trim().toDouble() - type = other[7].trim().toInt() + id = other[1].trim().toLongOrNull()?:1L + lon = other[2].trim().toDoubleOrNull()?:0.0 + lat = other[3].trim().toDoubleOrNull()?:0.0 + angle = other[5].trim().toDoubleOrNull()?:0.0 + type = other[7].trim().toIntOrNull()?:1 } else { - id = other[0].trim().toLong() - lon = other[1].trim().toDouble() - lat = other[2].trim().toDouble() - angle = other[4].trim().toDouble() - type = other[6].trim().toInt() + id = other[0].trim().toLongOrNull()?:1L + lon = other[1].trim().toDoubleOrNull()?:0.0 + lat = other[2].trim().toDoubleOrNull()?:0.0 + angle = other[4].trim().toDoubleOrNull()?:0.0 + type = other[6].trim().toIntOrNull()?:1 } if (i == count - 1) { centerMarkerOptions.lon = lon diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/view/MapAutoViewHelper.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/view/MapAutoViewHelper.kt index f0aefc0cd2..5c578b505f 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/view/MapAutoViewHelper.kt +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/view/MapAutoViewHelper.kt @@ -427,7 +427,7 @@ class MapAutoViewHelper(mapAutoView: MapAutoView) { /** * 设置地图模式 * - * @param stylemode 视图模式 0: 日间模式 1:夜间模式 2:SATEL模式 3:日间导航模式 4:夜间导航模式 + * @param stylemode 视图模式 0: 日间模式 1:夜间模式 2:SATEL模式 3:日间导航模式 4:夜间导航模式 5:夜间vr模式 6 默认白天模式 7 小巴车白天VR 8 Taxi白天 */ fun setMapStyle(stylemode: Int) { if (CompileConfig.DEBUG) { diff --git a/libraries/mapmodule/src/main/res/raw/guangquan.nt3d b/libraries/mapmodule/src/main/res/raw/guangquan.nt3d index 7185ca3b61..c0743182de 100644 Binary files a/libraries/mapmodule/src/main/res/raw/guangquan.nt3d and b/libraries/mapmodule/src/main/res/raw/guangquan.nt3d differ diff --git a/libraries/mapmodule/src/main/res/values/attrs.xml b/libraries/mapmodule/src/main/res/values/attrs.xml index 81fdb632bb..79d339c0eb 100644 --- a/libraries/mapmodule/src/main/res/values/attrs.xml +++ b/libraries/mapmodule/src/main/res/values/attrs.xml @@ -23,6 +23,8 @@ + +