xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

S3DBLayer: fix C-style string comparisons #189, #190

Browse Source
This commit is contained in:
Andrey Novikov 2016-09-28 15:19:04 +03:00 committed by Emux
parent 52bb54c006
commit 1a1d94e755
1 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
vtm/src/org/oscim/layers/tile/buildings/S3DBLayer.java
View File

@ -89,41 +89,41 @@ public class S3DBLayer extends TileLayer {
} }
if (roof) { if (roof) {
if ("brown" == color) if ("brown".equals(color))
return Color.get(120, 110, 110); return Color.get(120, 110, 110);
if ("red" == color) if ("red".equals(color))
return Color.get(235, 140, 130); return Color.get(235, 140, 130);
if ("green" == color) if ("green".equals(color))
return Color.get(150, 200, 130); return Color.get(150, 200, 130);
if ("blue" == color) if ("blue".equals(color))
return Color.get(100, 50, 200); return Color.get(100, 50, 200);
} }
if ("white" == color) if ("white".equals(color))
return Color.get(240, 240, 240); return Color.get(240, 240, 240);
if ("black" == color) if ("black".equals(color))
return Color.get(86, 86, 86); return Color.get(86, 86, 86);
if ("grey" == color || "gray" == color) if ("grey".equals(color) || "gray".equals(color))
return Color.get(120, 120, 120); return Color.get(120, 120, 120);
if ("red" == color) if ("red".equals(color))
return Color.get(255, 190, 190); return Color.get(255, 190, 190);
if ("green" == color) if ("green".equals(color))
return Color.get(190, 255, 190); return Color.get(190, 255, 190);
if ("blue" == color) if ("blue".equals(color))
return Color.get(190, 190, 255); return Color.get(190, 190, 255);
if ("yellow" == color) if ("yellow".equals(color))
return Color.get(255, 255, 175); return Color.get(255, 255, 175);
if ("darkgray" == color || "darkgrey" == color) if ("darkgray".equals(color) || "darkgrey".equals(color))
return Color.DKGRAY; return Color.DKGRAY;
if ("lightgray" == color || "lightgrey" == color) if ("lightgray".equals(color) || "lightgrey".equals(color))
return Color.LTGRAY; return Color.LTGRAY;
if ("transparent" == color) if ("transparent".equals(color))
return Color.get(0, 1, 1, 1); return Color.get(0, 1, 1, 1);
Integer css = ColorsCSS.get(color); Integer css = ColorsCSS.get(color);
if (css != null) if (css != null)
return ColorUtil.modHsv(css.intValue(), 1.0, HSV_S, HSV_V, true); return ColorUtil.modHsv(css, 1.0, HSV_S, HSV_V, true);
log.debug("unknown color:{}", color); log.debug("unknown color:{}", color);
return 0; return 0;
@ -132,52 +132,52 @@ public class S3DBLayer extends TileLayer {
static int getMaterialColor(String material, boolean roof) { static int getMaterialColor(String material, boolean roof) {
if (roof) { if (roof) {
if ("glass" == material) if ("glass".equals(material))
return Color.fade(Color.get(130, 224, 255), 0.9f); return Color.fade(Color.get(130, 224, 255), 0.9f);
} }
if ("roof_tiles" == material) if ("roof_tiles".equals(material))
return Color.get(216, 167, 111); return Color.get(216, 167, 111);
if ("tile" == material) if ("tile".equals(material))
return Color.get(216, 167, 111); return Color.get(216, 167, 111);
if ("concrete" == material || if ("concrete".equals(material) ||
"cement_block" == material) "cement_block".equals(material))
return Color.get(210, 212, 212); return Color.get(210, 212, 212);
if ("metal" == material) if ("metal".equals(material))
return 0xFFC0C0C0; return 0xFFC0C0C0;
if ("tar_paper" == material) if ("tar_paper".equals(material))
return 0xFF969998; return 0xFF969998;
if ("eternit" == material) if ("eternit".equals(material))
return Color.get(216, 167, 111); return Color.get(216, 167, 111);
if ("tin" == material) if ("tin".equals(material))
return 0xFFC0C0C0; return 0xFFC0C0C0;
if ("asbestos" == material) if ("asbestos".equals(material))
return Color.get(160, 152, 141); return Color.get(160, 152, 141);
if ("glass" == material) if ("glass".equals(material))
return Color.get(130, 224, 255); return Color.get(130, 224, 255);
if ("slate" == material) if ("slate".equals(material))
return 0xFF605960; return 0xFF605960;
if ("zink" == material) if ("zink".equals(material))
return Color.get(180, 180, 180); return Color.get(180, 180, 180);
if ("gravel" == material) if ("gravel".equals(material))
return Color.get(170, 130, 80); return Color.get(170, 130, 80);
if ("copper" == material) if ("copper".equals(material))
// same as roof color:green // same as roof color:green
return Color.get(150, 200, 130); return Color.get(150, 200, 130);
if ("wood" == material) if ("wood".equals(material))
return Color.get(170, 130, 80); return Color.get(170, 130, 80);
if ("grass" == material) if ("grass".equals(material))
return 0xFF50AA50; return 0xFF50AA50;
if ("stone" == material) if ("stone".equals(material))
return Color.get(206, 207, 181); return Color.get(206, 207, 181);
if ("plaster" == material) if ("plaster".equals(material))
return Color.get(236, 237, 181); return Color.get(236, 237, 181);
if ("brick" == material) if ("brick".equals(material))
return Color.get(255, 217, 191); return Color.get(255, 217, 191);
if ("stainless_steel" == material) if ("stainless_steel".equals(material))
return Color.get(153, 157, 160); return Color.get(153, 157, 160);
if ("gold" == material) if ("gold".equals(material))
return 0xFFFFD700; return 0xFFFFD700;
log.debug("unknown material:{}", material); log.debug("unknown material:{}", material);