Changeset 32105 in osm for applications/editors/josm/plugins/seachart
- Timestamp:
- 2016-03-08T17:20:54+01:00 (8 years ago)
- Location:
- applications/editors/josm/plugins/seachart
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/seachart/jrender/src/jrender/Jrender.java
r32095 r32105 137 137 138 138 public static void main(String[] args) throws Exception { 139 if (args.length < 5) { 140 System.err.println("Usage: java -jar jrender.jar <osm source directory> <tile directory> <zoom> <xtile> <ytile>"); 141 System.exit(-1); 142 } 139 143 srcdir = args[0]; 140 144 dstdir = args[1]; -
applications/editors/josm/plugins/seachart/src/render/Rules.java
r32101 r32105 155 155 } 156 156 157 static boolean hasAttribute(Obj obj, int idx,Att att) {157 static boolean hasAttribute(Obj obj, Att att) { 158 158 AttMap atts; 159 if ((atts = getAtts(obj, idx)) != null) {159 if ((atts = getAtts(obj, 0)) != null) { 160 160 AttVal<?> item = atts.get(att); 161 161 return item != null; … … 845 845 @SuppressWarnings("unchecked") 846 846 private static void landmarks() { 847 if ( testAttribute(Obj.LNDMRK, Att.CATLMK, CatLMK.LMK_UNKN)848 && ( testAttribute(Obj.LNDMRK, Att.CATLMK, FncFNC.FNC_UNKN) || testAttribute(Obj.LNDMRK, Att.CATLMK, FncFNC.FNC_LGHT))847 if (!hasAttribute(Obj.LNDMRK, Att.CATLMK) 848 && (!hasAttribute(Obj.LNDMRK, Att.FUNCTN) || testAttribute(Obj.LNDMRK, Att.FUNCTN, FncFNC.FNC_LGHT)) 849 849 && hasObject(Obj.LIGHTS)) 850 850 lights(); 851 if (Renderer.zoom >= 12) {851 else if (Renderer.zoom >= 12) { 852 852 switch (feature.type) { 853 853 case LNDMRK:
Note:
See TracChangeset
for help on using the changeset viewer.