Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix Rendering style. Introduce more options. Clean them from duplicated information

Browse source
This commit is contained in:
Victor Shcherb 2012-06-03 13:48:40 +02:00
parent 7a378ae2dc
commit 18bba6c0c4
7 changed files with 122 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
DataExtractionOSM/src/net/osmand/binary/BinaryInspector.java
View file

@ -48,7 +48,7 @@ public class BinaryInspector {
// test cases show info
// inspector(new String[]{"-vmap", /*"-bbox=-121.785,37.35,-121.744,37.33", */"/home/victor/projects/OsmAnd/*/Map.obf"});
inspector(new String[]{"-vmap", /*"-bbox=-121.785,37.35,-121.744,37.33", */"/home/victor/projects/OsmAnd/data/osm-gen/Map.obf"});
// test case extract parts
// test case
}

4
DataExtractionOSM/src/net/osmand/osm/rendering_types.xml
View file

@ -21,8 +21,8 @@
<type tag="layer" value="+3" target_value="1" minzoom="10" additional="true"/>
<type tag="layer" value="-3" target_value="-1" minzoom="10" additional="true"/>
<type tag="bridge" minzoom="10" additional="true"/>
<type tag="tunnel" minzoom="10" additional="true"/>
<type tag="bridge" value="yes" minzoom="10" additional="true"/>
<type tag="tunnel" value="yes" minzoom="10" additional="true"/>
<category name="highway">
<type tag="highway" value="motorway" minzoom="5" nameTags="ref"/>

179
DataExtractionOSM/src/net/osmand/render/default.render.xml
View file

@ -1029,62 +1029,63 @@
</group>
<group>
<filter hmRendered="true" tag="highway" value="motorway" color="#809bff" color_2="#809bff"/>
<filter tag="highway" value="motorway" color="#a58dff" color_2="#a58dff"/>
<filter hmRendered="true" tag="highway" value="motorway_link" color="#809bff" color_2="#809bff"/>
<filter tag="highway" value="motorway_link" color="#a58dff" color_2="#a58dff"/>
<filter hmRendered="true" tag="highway" value="trunk" color="#df1346" color_2="#df1346"/>
<filter tag="highway" value="trunk" color="#ffaf80" color_2="#ffaf80"/>
<filter hmRendered="true" tag="highway" value="trunk_link" color="#df1346" color_2="#df1346"/>
<filter tag="highway" value="trunk_link" color="#ffaf80" color_2="#ffaf80"/>
<filter tag="highway" value="primary" color="#eb989a" color_2="#eb989a"/>
<filter tag="highway" value="primary_link" color="#eb989a" color_2="#eb989a"/>
<filter tag="highway" value="secondary" color="#fdd6a4" color_2="#fdd6a4"/>
<filter tag="highway" value="secondary_link" color="#fdd6a4" color_2="#fdd6a4"/>
<filter hmRendered="true" tag="highway" value="motorway" color="#809bff"/>
<filter tag="highway" value="motorway" color="#a58dff" />
<filter hmRendered="true" tag="highway" value="motorway_link" color="#809bff"/>
<filter tag="highway" value="motorway_link" color="#a58dff" />
<filter hmRendered="true" tag="highway" value="trunk" color="#df1346" />
<filter tag="highway" value="trunk" color="#ffaf80" />
<filter hmRendered="true" tag="highway" value="trunk_link" color="#df1346" />
<filter tag="highway" value="trunk_link" color="#ffaf80" />
<filter tag="highway" value="primary" color="#eb989a" />
<filter tag="highway" value="primary_link" color="#eb989a" />
<filter tag="highway" value="secondary" color="#fdd6a4" />
<filter tag="highway" value="secondary_link" color="#fdd6a4" />
<groupFilter shadowRadius="1" cap="ROUND">
<!-- Bridges -->
<filter layer="1" color="#000000" shadowRadius="0" cap="BUTT" cap_2="SQUARE">
<filter minzoom="14" maxzoom="15" strokeWidth="14" strokeWidth_2="12"/>
<filter minzoom="16" maxzoom="16" strokeWidth="17" strokeWidth_2="15"/>
<filter minzoom="17" maxzoom="17" strokeWidth="21" strokeWidth_2="19"/>
<filter minzoom="18" strokeWidth="26" strokeWidth_2="24"/>
<groupFilter nightMode="true" color="#ffffff"/>
</filter>
<filter>
<filter minzoom="14" maxzoom="14" strokeWidth="10"/>
<filter minzoom="15" maxzoom="15" strokeWidth="12"/>
<filter minzoom="16" maxzoom="16" strokeWidth="15"/>
<filter minzoom="17" maxzoom="17" strokeWidth="19"/>
<filter minzoom="18" strokeWidth="24"/>
<groupFilter layer="-1" pathEffect="4_4" cap="BUTT"/>
</filter>
<groupFilter layer="-1" pathEffect="4_4" cap="BUTT"/>
<!-- Bridges -->
<groupFilter layer="1" color_0="#000000" shadowRadius="0" cap_0="BUTT" cap="SQUARE">
<filter minzoom="14" maxzoom="15" strokeWidth_0="14" />
<filter minzoom="16" maxzoom="16" strokeWidth_0="17" />
<filter minzoom="17" maxzoom="17" strokeWidth_0="21" />
<filter minzoom="18" strokeWidth_0="26" />
<groupFilter nightMode="true" color_0="#ffffff"/>
</groupFilter>
</groupFilter>
</group>
<group>
<filter tag="highway" value="tertiary"/>
<filter tag="highway" value="tertiary_link"/>
<groupFilter color="#fefeb3" color_2="#fefeb3" shadowRadius="1" cap="ROUND">
<groupFilter color="#fefeb3" shadowRadius="1" cap="ROUND">
<filter minzoom="10" maxzoom="10" strokeWidth="3"/>
<filter minzoom="11" maxzoom="11" strokeWidth="4"/>
<filter minzoom="12" maxzoom="12" strokeWidth="5"/>
<filter minzoom="13" maxzoom="13" strokeWidth="6"/>
<!-- Bridges -->
<filter layer="1" color="#000000" shadowRadius="0" cap="BUTT" cap_2="SQUARE">
<filter minzoom="14" maxzoom="14" strokeWidth="8" strokeWidth_2="6"/>
<filter minzoom="15" maxzoom="15" strokeWidth="10" strokeWidth_2="8"/>
<filter minzoom="16" maxzoom="16" strokeWidth="12" strokeWidth_2="10"/>
<filter minzoom="17" maxzoom="17" strokeWidth="15" strokeWidth_2="13"/>
<filter minzoom="18" strokeWidth="20" strokeWidth_2="18"/>
<groupFilter nightMode="true" color="#ffffff"/>
</filter>
<filter>
<filter color_0="#000000" >
<filter minzoom="14" maxzoom="14" strokeWidth="6"/>
<filter minzoom="15" maxzoom="15" strokeWidth="8"/>
<filter minzoom="16" maxzoom="16" strokeWidth="10"/>
<filter minzoom="17" maxzoom="17" strokeWidth="13"/>
<filter minzoom="18" strokeWidth="18"/>
<groupFilter layer="-1" pathEffect="4_4" cap="BUTT"/>
<groupFilter nightMode="true" color_0="#ffffff" />
<!-- Bridges -->
<groupFilter layer="1" shadowRadius="0" cap_0="BUTT" cap="SQUARE">
<filter minzoom="14" maxzoom="14" strokeWidth_0="8" />
<filter minzoom="15" maxzoom="15" strokeWidth_0="10" />
<filter minzoom="16" maxzoom="16" strokeWidth_0="12" />
<filter minzoom="17" maxzoom="17" strokeWidth_0="15" />
<filter minzoom="18" strokeWidth_0="20" />
</groupFilter>
</filter>
</groupFilter>
</group>
@ -1093,7 +1094,7 @@
<filter tag="highway" value="road" />
<filter tag="highway" value="unclassified" />
<filter tag="highway" value="residential"/>
<groupFilter color="#ffffff" shadowRadius="1" cap="ROUND">
<groupFilter color="#ffffff" color_0="#000000" shadowRadius="1" cap="ROUND">
<filter>
<filter hmRendered="true" minzoom="12" maxzoom="12" strokeWidth="3"/>
<filter hmRendered="true" minzoom="13" maxzoom="13" strokeWidth="4"/>
@ -1108,12 +1109,12 @@
<groupFilter nightMode="true" color="#9F9F9F" color_0="#ffffff" />
<groupFilter layer="-1" pathEffect="4_4" cap="BUTT"/>
<!-- Bridges -->
<groupFilter layer="1" color_0="#000000" minzoom="14" shadowRadius="0" cap_0="BUTT" cap="SQUARE">
<groupFilter layer="1" minzoom="14" shadowRadius="0" cap_0="BUTT" cap="SQUARE">
<filter minzoom="14" maxzoom="14" strokeWidth_0="5"/>
<filter minzoom="15" maxzoom="15" strokeWidth_0="10"/>
<filter minzoom="16" maxzoom="16" strokeWidth_0="12"/>
<filter minzoom="17" maxzoom="17" strokeWidth_0="15"/>
<filter minzoom="18" strokeWidth="20" strokeWidth_2="18"/>
<filter minzoom="18" strokeWidth_0="20"/>
</groupFilter>
<groupFilter minzoom="15" additional="access=no" color_3="#F7D4D4" strokeWidth_3="5" pathEffect_3="10_3"/>
<groupFilter minzoom="15" additional="access=private" color_3="#F7D4D4" strokeWidth_3="5" pathEffect_3="10_3"/>
@ -1124,16 +1125,7 @@
<filter tag="highway" value="service"/>
<filter tag="highway" value="living_street"/>
<filter tag="highway" value="pedestrian"/>
<groupFilter color="#ececec" color_2="#ececec" shadowRadius="1" cap="ROUND">
<!-- Bridges -->
<filter layer="1" color="#000000" shadowRadius="0" cap="BUTT" cap_2="SQUARE">
<filter hmRendered="true" minzoom="14" maxzoom="14" strokeWidth="5" strokeWidth_2="3"/>
<filter minzoom="15" maxzoom="15" strokeWidth="6" strokeWidth_2="4"/>
<filter minzoom="16" maxzoom="16" strokeWidth="7" strokeWidth_2="5"/>
<filter minzoom="17" maxzoom="17" strokeWidth="10" strokeWidth_2="8"/>
<filter minzoom="18" strokeWidth="14" strokeWidth_2="12"/>
<groupFilter nightMode="true" color="#ffffff"/>
</filter>
<groupFilter color="#ececec" shadowRadius="1" cap="ROUND">
<filter>
<filter hmRendered="true" minzoom="13" maxzoom="13" strokeWidth="2"/>
<filter hmRendered="true" minzoom="14" maxzoom="14" strokeWidth="3"/>
@ -1141,8 +1133,17 @@
<filter minzoom="16" maxzoom="16" strokeWidth="5"/>
<filter minzoom="17" maxzoom="17" strokeWidth="8"/>
<filter minzoom="18" strokeWidth="11"/>
<groupFilter layer="-1" pathEffect="4_4" cap="BUTT"/>
</filter>
<groupFilter layer="-1" pathEffect="4_4" cap="BUTT"/>
<!-- Bridges -->
<groupFilter layer="1" color_0="#000000" shadowRadius="0" cap_0="BUTT" cap="SQUARE">
<filter hmRendered="true" minzoom="14" maxzoom="14" strokeWidth_0="5" />
<filter minzoom="15" maxzoom="15" strokeWidth_0="6" />
<filter minzoom="16" maxzoom="16" strokeWidth_0="7" />
<filter minzoom="17" maxzoom="17" strokeWidth_0="10"/>
<filter minzoom="18" strokeWidth_0="14" />
<groupFilter nightMode="true" color_0="#ffffff"/>
</groupFilter>
<groupFilter minzoom="15" additional="access=no" color_3="#F7D4D4" strokeWidth_3="3" pathEffect_3="10_3"/>
<groupFilter minzoom="15" additional="access=private" color_3="#F7D4D4" strokeWidth_3="3" pathEffect_3="10_3"/>
</groupFilter>
@ -1165,64 +1166,64 @@
</filter>
<!-- byway is deprecated tag, describes UK-only road. Proper tag should be highway=track or highway=path -->
<filter tag="highway" value="byway" color="#996600" pathEffect="6_3" color_3="#996600" pathEffect_3="6_3">
<filter appMode="pedestrian" hmRendered="true" minzoom="14" strokeWidth="2" pathEffect="10_3" strokeWidth_3="2" pathEffect_3="10_3"/>
<filter appMode="pedestrian" minzoom="15" strokeWidth="2" pathEffect="10_3" strokeWidth_3="2" pathEffect_3="10_3"/>
<filter appMode="bicycle" minzoom="14" strokeWidth="2" pathEffect="10_3" strokeWidth_3="2" pathEffect_3="10_3"/>
<filter hmRendered="true" minzoom="12" maxzoom="12" strokeWidth="0.5" strokeWidth_3="0.5"/>
<filter hmRendered="true" minzoom="13" strokeWidth="1" strokeWidth_3="1"/>
<filter minzoom="14" strokeWidth="1" strokeWidth_3="1"/>
<filter tag="highway" value="byway" color="#996600" pathEffect="6_3" >
<filter appMode="pedestrian" hmRendered="true" minzoom="14" strokeWidth="2" pathEffect="10_3"/>
<filter appMode="pedestrian" minzoom="15" strokeWidth="2" pathEffect="10_3" />
<filter appMode="bicycle" minzoom="14" strokeWidth="2" pathEffect="10_3" />
<filter hmRendered="true" minzoom="12" maxzoom="12" strokeWidth="0.5"/>
<filter hmRendered="true" minzoom="13" strokeWidth="1" />
<filter minzoom="14" strokeWidth="1" />
</filter>
<filter tag="highway" value="path" color="#000000" pathEffect="6_3" color_3="#000000" pathEffect_3="6_3">
<filter appMode="pedestrian" hmRendered="true" minzoom="14" strokeWidth="2" pathEffect="10_3" strokeWidth_3="2" pathEffect_3="10_3"/>
<filter appMode="pedestrian" minzoom="15" strokeWidth="2" pathEffect="10_3" strokeWidth_3="2" pathEffect_3="10_3"/>
<filter hmRendered="true" minzoom="12" maxzoom="12" strokeWidth="0.5" strokeWidth_3="0.5"/>
<filter hmRendered="true" minzoom="13" strokeWidth="1" strokeWidth_3="1"/>
<filter minzoom="14" strokeWidth="1" strokeWidth_3="1"/>
<groupFilter nightMode="true" color="#787878" color_3="#787878"/>
<filter tag="highway" value="path" color="#000000" pathEffect="6_3" >
<filter appMode="pedestrian" hmRendered="true" minzoom="14" strokeWidth="2" pathEffect="10_3" />
<filter appMode="pedestrian" minzoom="15" strokeWidth="2" pathEffect="10_3" />
<filter hmRendered="true" minzoom="12" maxzoom="12" strokeWidth="0.5" />
<filter hmRendered="true" minzoom="13" strokeWidth="1" />
<filter minzoom="14" strokeWidth="1" />
<groupFilter nightMode="true" color="#787878"/>
</filter>
<filter tag="highway" value="cycleway" color="#0000ff" pathEffect="2_2" color_3="#0000ff" pathEffect_3="2_2">
<filter appMode="bicycle" minzoom="14" strokeWidth="2" pathEffect="10_3" strokeWidth_3="2" pathEffect_3="10_3"/>
<filter appMode="pedestrian" hmRendered="true" minzoom="14" strokeWidth="2" pathEffect="10_3" strokeWidth_3="2" pathEffect_3="10_3"/>
<filter hmRendered="true" minzoom="12" maxzoom="12" strokeWidth="0.5" strokeWidth_3="0.5"/>
<filter hmRendered="true" minzoom="13" strokeWidth="1" strokeWidth_3="1"/>
<filter minzoom="14" strokeWidth="1" strokeWidth_3="1"/>
<filter tag="highway" value="cycleway" color="#0000ff" pathEffect="2_2" >
<filter appMode="bicycle" minzoom="14" strokeWidth="2" pathEffect="10_3" />
<filter appMode="pedestrian" hmRendered="true" minzoom="14" strokeWidth="2" pathEffect="10_3"/>
<filter hmRendered="true" minzoom="12" maxzoom="12" strokeWidth="0.5" />
<filter hmRendered="true" minzoom="13" strokeWidth="1" />
<filter minzoom="14" strokeWidth="1" />
</filter>
<filter tag="highway" value="footway" color="#fa5073" pathEffect="2_2" color_3="#fa5073" pathEffect_3="2_2">
<filter appMode="pedestrian" hmRendered="true" minzoom="14" strokeWidth="2" pathEffect="10_3" strokeWidth_3="2" pathEffect_3="10_3"/>
<filter appMode="pedestrian" minzoom="15" strokeWidth="2" pathEffect="10_3" strokeWidth_3="2" pathEffect_3="10_3"/>
<filter hmRendered="true" minzoom="12" maxzoom="12" strokeWidth="0.5" strokeWidth_3="0.5"/>
<filter hmRendered="true" minzoom="13" strokeWidth="1" strokeWidth_3="1"/>
<filter minzoom="16" strokeWidth="1" strokeWidth_3="1"/>
<filter tag="highway" value="footway" color="#fa5073" pathEffect="2_2" >
<filter appMode="pedestrian" hmRendered="true" minzoom="14" strokeWidth="2" pathEffect="10_3"/>
<filter appMode="pedestrian" minzoom="15" strokeWidth="2" pathEffect="10_3"/>
<filter hmRendered="true" minzoom="12" maxzoom="12" strokeWidth="0.5"/>
<filter hmRendered="true" minzoom="13" strokeWidth="1"/>
<filter minzoom="16" strokeWidth="1"/>
</filter>
<filter tag="highway" value="steps" color="#fa5073" pathEffect="1_2" color_3="#fa5073" pathEffect_3="1_2">
<filter appMode="pedestrian" hmRendered="true" minzoom="14" strokeWidth="4" pathEffect="2_2" strokeWidth_3="4" pathEffect_3="2_2"/>
<filter appMode="pedestrian" minzoom="15" strokeWidth="4" pathEffect="2_2" strokeWidth_3="4" pathEffect_3="2_2"/>
<filter hmRendered="true" minzoom="14" strokeWidth="4" strokeWidth_3="4"/>
<filter minzoom="16" strokeWidth="4" strokeWidth_3="4"/>
<filter tag="highway" value="steps" color="#fa5073" pathEffect="1_2" >
<filter appMode="pedestrian" hmRendered="true" minzoom="14" strokeWidth="4" pathEffect="2_2" />
<filter appMode="pedestrian" minzoom="15" strokeWidth="4" pathEffect="2_2" />
<filter hmRendered="true" minzoom="14" strokeWidth="4" />
<filter minzoom="16" strokeWidth="4" />
</filter>
<filter tag="highway" value="bridleway" color="#339900" pathEffect="2_2" color_3="#339900" pathEffect_3="2_2">
<filter appMode="pedestrian" hmRendered="true" minzoom="14" strokeWidth="2" pathEffect="10_3" strokeWidth_3="2" pathEffect_3="10_3"/>
<filter appMode="pedestrian" minzoom="15" strokeWidth="2" pathEffect="10_3" strokeWidth_3="2" pathEffect_3="10_3"/>
<filter hmRendered="true" minzoom="12" maxzoom="12" strokeWidth="0.5" strokeWidth_3="0.5"/>
<filter hmRendered="true" minzoom="13" strokeWidth="1" strokeWidth_3="1"/>
<filter minzoom="16" strokeWidth="1" strokeWidth_3="1"/>
<filter tag="highway" value="bridleway" color="#339900" pathEffect="2_2">
<filter appMode="pedestrian" hmRendered="true" minzoom="14" strokeWidth="2" pathEffect="10_3"/>
<filter appMode="pedestrian" minzoom="15" strokeWidth="2" pathEffect="10_3" />
<filter hmRendered="true" minzoom="12" maxzoom="12" strokeWidth="0.5" />
<filter hmRendered="true" minzoom="13" strokeWidth="1" />
<filter minzoom="16" strokeWidth="1" />
</filter>
<!-- Bridges -->
<groupFilter layer="1">
<filter nightMode="true" minzoom="14" color="#ffffff" strokeWidth="6.5" pathEffect="" color_2="#000000" strokeWidth_2="5"/>
<filter minzoom="14" color="#000000" strokeWidth="6.5" pathEffect="" color_2="#ffffff" strokeWidth_2="5"/>
<filter nightMode="true" minzoom="14" color__1="#ffffff" strokeWidth__1="6.5" color_0="#000000" strokeWidth_0="5"/>
<filter minzoom="14" color__1="#000000" strokeWidth__1="6.5" color_0="#ffffff" strokeWidth_0="5"/>
</groupFilter>
<!-- Tunnels -->
<groupFilter layer="-1">
<filter nightMode="true" minzoom="14" color="#ffffff" strokeWidth="6.5" pathEffect="3_3" color_2="#000000" strokeWidth_2="5"/>
<filter minzoom="14" color="#000000" strokeWidth="6.5" pathEffect="3_3" color_2="#ffffff" strokeWidth_2="5"/>
<filter nightMode="true" minzoom="14" color__1="#ffffff" strokeWidth__1="6.5" pathEffect__1="3_3" color_0="#000000" strokeWidth_0="5"/>
<filter minzoom="14" color__1="#000000" strokeWidth__1="6.5" pathEffect__1="3_3" color_0="#ffffff" strokeWidth_0="5"/>
</groupFilter>
</group>
@ -1268,7 +1269,7 @@
<filter minzoom="16" color="#aed1a0" strokeWidth="3" tag="natural" value="hedge"/>
<filter minzoom="16" color="#333333" strokeWidth="1" tag="fenced" value="yes"/>
<!-- Waterways -->
<!-- Group of all Waterways with same color -->
<group>
<filter tag="waterway" value="stream" minzoom="12" strokeWidth="2">
<filter layer="-1" strokeWidth="3" strokeWidth_2="1" pathEffect_2="4_2"/>
@ -1295,6 +1296,7 @@
<filter minzoom="18" strokeWidth="12"/>
</groupFilter>
</group>
<group>
<filter tag="waterway" value="ditch"/>
<filter tag="waterway" value="drain"/>
@ -1304,6 +1306,7 @@
<filter minzoom="15" strokeWidth="3"/>
</groupFilter>
</group>
<!-- Waterway color -->
<groupFilter color="#b5d0d0" color_2="#ffffff">
<filter nightMode="true" color="#330099" color_2="#7340D9"/>
</groupFilter>

2
DataExtractionOSM/src/net/osmand/swing/NativeSwingRendering.java
View file

@ -11,7 +11,6 @@ import javax.imageio.ImageIO;
import javax.imageio.ImageReader;
import javax.imageio.stream.MemoryCacheImageInputStream;
import org.omg.stub.java.rmi._Remote_Stub;
import org.xml.sax.SAXException;
import resources._R;
@ -71,6 +70,7 @@ public class NativeSwingRendering extends NativeLibrary {
return _R.getIconData(data);
}
};
rctx.nightMode = true;
RenderingRuleSearchRequest request = new RenderingRuleSearchRequest(storage);
NativeSearchResult res = searchObjectsForRendering(sleft, sright, stop, sbottom, zoom, request, true,

6
OsmAnd/src/net/osmand/plus/render/OsmandRenderer.java
View file

@ -688,12 +688,18 @@ public class OsmandRenderer {
}
drawPolylineShadow(canvas, rc, path, shadowColor, shadowRadius);
} else {
boolean update = false;
if (updatePaint(render, paint, -2, false, rc)) {
update = true;
canvas.drawPath(path, paint);
}
if (updatePaint(render, paint, -1, false, rc)) {
update = true;
canvas.drawPath(path, paint);
}
if(update) {
updatePaint(render, paint, 0, false, rc);
}
canvas.drawPath(path, paint);
if (updatePaint(render, paint, 1, false, rc)) {
canvas.drawPath(path, paint);

13
Osmand-kernel/osmand/src/mapObjects.h
View file

@ -57,6 +57,8 @@ public:
int getSimpleLayer() {
std::vector<tag_value>::iterator it = additionalTypes.begin();
bool tunnel = false;
bool bridge = false;
while (it != additionalTypes.end()) {
if (it->first == "layer") {
if(it->second.length() > 0) {
@ -65,12 +67,19 @@ public:
} else {
return 1;
}
} else {
return 0;
}
} else if (it->first == "tunnel") {
tunnel = "yes" == it->second;
} else if (it->first == "bridge") {
bridge = "yes" == it->second;
}
it++;
}
if (tunnel) {
return -1;
} else if (bridge) {
return 1;
}
return 0;
}
};

13
Osmand-kernel/osmand/src/rendering.cpp
View file

@ -127,11 +127,12 @@ int updatePaint(RenderingRuleSearchRequest* req, SkPaint* paint, int ind, int ar
rCap = req->props()->R_CAP_3;
rPathEff = req->props()->R_PATH_EFFECT_3;
}
paint->setColorFilter(NULL);
paint->setShader(NULL);
paint->setLooper(NULL);
if (area)
{
paint->setColorFilter(NULL);
paint->setShader(NULL);
paint->setLooper(NULL);
paint->setStyle(SkPaint::kStrokeAndFill_Style);
paint->setStrokeWidth(0);
}
@ -140,6 +141,9 @@ int updatePaint(RenderingRuleSearchRequest* req, SkPaint* paint, int ind, int ar
float stroke = req->getFloatPropertyValue(rStrokeW);
if (!(stroke > 0))
return 0;
paint->setColorFilter(NULL);
paint->setShader(NULL);
paint->setLooper(NULL);
paint->setStyle(SkPaint::kStroke_Style);
paint->setStrokeWidth(stroke);
@ -343,6 +347,9 @@ void drawPolyline(MapDataObject* mObj, RenderingRuleSearchRequest* req, SkCanvas
if (updatePaint(req, paint, -1, 0, rc)) {
PROFILE_NATIVE_OPERATION(rc, cv->drawPath(path, *paint));
}
if (updatePaint(req, paint, 0, 0, rc)) {
PROFILE_NATIVE_OPERATION(rc, cv->drawPath(path, *paint));
}
PROFILE_NATIVE_OPERATION(rc, cv->drawPath(path, *paint));
if (updatePaint(req, paint, 1, 0, rc)) {
PROFILE_NATIVE_OPERATION(rc, cv->drawPath(path, *paint));