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

Fix oneway -1

Browse source
This commit is contained in:
Victor Shcherb 2012-06-25 18:38:04 +02:00
parent 57ce2cb43a
commit 6a2fe4afa9
2 changed files with 68 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -736,8 +736,8 @@ public class OsmandRenderer {
if(reverseOneWay == null){ if(reverseOneWay == null){
PathEffect arrowDashEffect1 = new DashPathEffect(new float[] { 0, 12, 10, 152 }, 0); PathEffect arrowDashEffect1 = new DashPathEffect(new float[] { 0, 12, 10, 152 }, 0);
PathEffect arrowDashEffect2 = new DashPathEffect(new float[] { 0, 13, 9, 152 }, 1); PathEffect arrowDashEffect2 = new DashPathEffect(new float[] { 0, 13, 9, 152 }, 1);
PathEffect arrowDashEffect3 = new DashPathEffect(new float[] { 0, 14, 2, 148 }, 1); PathEffect arrowDashEffect3 = new DashPathEffect(new float[] { 0, 14, 2, 158 }, 1);
PathEffect arrowDashEffect4 = new DashPathEffect(new float[] { 0, 15, 1, 148 }, 1); PathEffect arrowDashEffect4 = new DashPathEffect(new float[] { 0, 15, 1, 158 }, 1);
reverseOneWay = new Paint[4]; reverseOneWay = new Paint[4];
reverseOneWay[0] = oneWayPaint(); reverseOneWay[0] = oneWayPaint();
reverseOneWay[0].setStrokeWidth(1); reverseOneWay[0].setStrokeWidth(1);

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

@ -251,6 +251,7 @@ void drawPolylineShadow(SkCanvas* cv, SkPaint* paint, RenderingContext* rc, SkPa
} }
std::vector<SkPaint> oneWayPaints; std::vector<SkPaint> oneWayPaints;
std::vector<SkPaint> reverseWayPaints;
SkPaint* oneWayPaint(){ SkPaint* oneWayPaint(){
SkPaint* oneWay = new SkPaint; SkPaint* oneWay = new SkPaint;
oneWay->setStyle(SkPaint::kStroke_Style); oneWay->setStyle(SkPaint::kStroke_Style);
@ -258,41 +259,75 @@ SkPaint* oneWayPaint(){
oneWay->setAntiAlias(true); oneWay->setAntiAlias(true);
return oneWay; return oneWay;
} }
void drawOneWayPaints(RenderingContext* rc, SkCanvas* cv, SkPath* p) { void drawOneWayPaints(RenderingContext* rc, SkCanvas* cv, SkPath* p, int oneway) {
if (oneWayPaints.size() == 0) { if (oneWayPaints.size() == 0) {
SkPathEffect* arrowDashEffect1 = new SkDashPathEffect((float []){ 0, 12, 10, 152 }, 4, 0); SkPathEffect* arrowDashEffect1 = new SkDashPathEffect((float []) {0, 12, 10, 152}, 4, 0);
SkPathEffect* arrowDashEffect2 = new SkDashPathEffect((float[]){ 0, 12, 9, 153 }, 4, 1); SkPathEffect* arrowDashEffect2 = new SkDashPathEffect((float[]) {0, 12, 9, 153}, 4, 1);
SkPathEffect* arrowDashEffect3 = new SkDashPathEffect((float[]){ 0, 18, 2, 154 }, 4, 1); SkPathEffect* arrowDashEffect3 = new SkDashPathEffect((float[]) {0, 18, 2, 154}, 4, 1);
SkPathEffect* arrowDashEffect4 = new SkDashPathEffect((float[]){ 0, 18, 1, 155 }, 4, 1); SkPathEffect* arrowDashEffect4 = new SkDashPathEffect((float[]) {0, 18, 1, 155}, 4, 1);
SkPaint* p = oneWayPaint(); SkPaint* p = oneWayPaint();
p->setStrokeWidth(1); p->setStrokeWidth(1);
p->setPathEffect(arrowDashEffect1)->unref(); p->setPathEffect(arrowDashEffect1)->unref();
oneWayPaints.push_back(*p); oneWayPaints.push_back(*p);
delete p; delete p;
p = oneWayPaint(); p = oneWayPaint();
p->setStrokeWidth(2); p->setStrokeWidth(2);
p->setPathEffect(arrowDashEffect2)->unref(); p->setPathEffect(arrowDashEffect2)->unref();
oneWayPaints.push_back(*p); oneWayPaints.push_back(*p);
delete p; delete p;
p = oneWayPaint(); p = oneWayPaint();
p->setStrokeWidth(3); p->setStrokeWidth(3);
p->setPathEffect(arrowDashEffect3)->unref(); p->setPathEffect(arrowDashEffect3)->unref();
oneWayPaints.push_back(*p); oneWayPaints.push_back(*p);
delete p; delete p;
p = oneWayPaint(); p = oneWayPaint();
p->setStrokeWidth(4); p->setStrokeWidth(4);
p->setPathEffect(arrowDashEffect4)->unref(); p->setPathEffect(arrowDashEffect4)->unref();
oneWayPaints.push_back(*p); oneWayPaints.push_back(*p);
delete p; delete p;
} }
if (reverseWayPaints.size() == 0) {
SkPathEffect* arrowDashEffect1 = new SkDashPathEffect((float []) {0, 12, 10, 152}, 4, 0);
SkPathEffect* arrowDashEffect2 = new SkDashPathEffect((float[]) {0, 13, 9, 152}, 4, 1);
SkPathEffect* arrowDashEffect3 = new SkDashPathEffect((float[]) {0, 14, 2, 158}, 4, 1);
SkPathEffect* arrowDashEffect4 = new SkDashPathEffect((float[]) {0, 15, 1, 158}, 4, 1);
SkPaint* p = oneWayPaint();
p->setStrokeWidth(1);
p->setPathEffect(arrowDashEffect1)->unref();
reverseWayPaints.push_back(*p);
delete p;
for (size_t i = 0; i < oneWayPaints.size(); i++) { p = oneWayPaint();
PROFILE_NATIVE_OPERATION(rc, cv->drawPath(*p, oneWayPaints.at(i))); p->setStrokeWidth(2);
} p->setPathEffect(arrowDashEffect2)->unref();
reverseWayPaints.push_back(*p);
delete p;
p = oneWayPaint();
p->setStrokeWidth(3);
p->setPathEffect(arrowDashEffect3)->unref();
reverseWayPaints.push_back(*p);
delete p;
p = oneWayPaint();
p->setStrokeWidth(4);
p->setPathEffect(arrowDashEffect4)->unref();
reverseWayPaints.push_back(*p);
delete p;
}
if (oneway > 0) {
for (size_t i = 0; i < oneWayPaints.size(); i++) {
PROFILE_NATIVE_OPERATION(rc, cv->drawPath(*p, oneWayPaints.at(i)));
}
} else {
for (size_t i = 0; i < reverseWayPaints.size(); i++) {
PROFILE_NATIVE_OPERATION(rc, cv->drawPath(*p, reverseWayPaints.at(i)));
}
}
} }
@ -364,7 +399,7 @@ void drawPolyline(MapDataObject* mObj, RenderingRuleSearchRequest* req, SkCanvas
PROFILE_NATIVE_OPERATION(rc, cv->drawPath(path, *paint)); PROFILE_NATIVE_OPERATION(rc, cv->drawPath(path, *paint));
} }
if (oneway && !drawOnlyShadow) { if (oneway && !drawOnlyShadow) {
drawOneWayPaints(rc, cv, &path); drawOneWayPaints(rc, cv, &path, oneway);
} }
if (!drawOnlyShadow) { if (!drawOnlyShadow) {
renderText(mObj, req, rc, pair.first, pair.second, middlePoint.fX, middlePoint.fY, &path); renderText(mObj, req, rc, pair.first, pair.second, middlePoint.fX, middlePoint.fY, &path);