Changeset 7563 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java
- Timestamp:
- 2014-09-19T18:29:23+02:00 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java
r7486 r7563 168 168 private Pair<StyleList, Range> getImpl(OsmPrimitive osm, double scale, NavigatableComponent nc) { 169 169 if (osm instanceof Node) 170 return generateStyles(osm, scale, null,false);170 return generateStyles(osm, scale, false); 171 171 else if (osm instanceof Way) 172 172 { 173 Pair<StyleList, Range> p = generateStyles(osm, scale, null,false);173 Pair<StyleList, Range> p = generateStyles(osm, scale, false); 174 174 175 175 boolean isOuterWayOfSomeMP = false; … … 252 252 253 253 if (multipolygon.getInnerWays().contains(osm)) { 254 Iterator<Way> it = multipolygon.getOuterWays().iterator(); 255 p = generateStyles(osm, scale, it.hasNext() ? it.next() : null, false); 254 p = generateStyles(osm, scale, false); 256 255 boolean hasIndependentElemStyle = false; 257 256 for (ElemStyle s : p.a) { … … 282 281 else if (osm instanceof Relation) 283 282 { 284 Pair<StyleList, Range> p = generateStyles(osm, scale, null,true);283 Pair<StyleList, Range> p = generateStyles(osm, scale, true); 285 284 if (drawMultipolygon && ((Relation)osm).isMultipolygon()) { 286 285 if (!Utils.exists(p.a, AreaElemStyle.class)) { … … 288 287 Multipolygon multipolygon = MultipolygonCache.getInstance().get(nc, (Relation) osm); 289 288 for (Way w : multipolygon.getOuterWays()) { 290 Pair<StyleList, Range> wayStyles = generateStyles(w, scale, null,false);289 Pair<StyleList, Range> wayStyles = generateStyles(w, scale, false); 291 290 p.b = Range.cut(p.b, wayStyles.b); 292 291 ElemStyle area = Utils.find(wayStyles.a, AreaElemStyle.class); … … 319 318 * @return the generated styles and the valid range as a pair 320 319 */ 321 public Pair<StyleList, Range> generateStyles(OsmPrimitive osm, double scale, OsmPrimitive multipolyOuterWay,boolean pretendWayIsClosed) {320 public Pair<StyleList, Range> generateStyles(OsmPrimitive osm, double scale, boolean pretendWayIsClosed) { 322 321 323 322 List<ElemStyle> sl = new ArrayList<>(); … … 327 326 for (StyleSource s : styleSources) { 328 327 if (s.active) { 329 s.apply(mc, osm, scale, multipolyOuterWay,pretendWayIsClosed);328 s.apply(mc, osm, scale, pretendWayIsClosed); 330 329 } 331 330 } … … 402 401 for (StyleSource s : styleSources) { 403 402 if (s.active) { 404 s.apply(mc, r, 1, null,false);403 s.apply(mc, r, 1, false); 405 404 } 406 405 } … … 451 450 if (MapPaintStyles.getStyles() == null) 452 451 return null; 453 for (ElemStyle s : MapPaintStyles.getStyles().generateStyles(p, 1.0, null,pretendWayIsClosed).a) {452 for (ElemStyle s : MapPaintStyles.getStyles().generateStyles(p, 1.0, pretendWayIsClosed).a) { 454 453 if (s instanceof AreaElemStyle) 455 454 return (AreaElemStyle) s; … … 484 483 if (MapPaintStyles.getStyles() == null) 485 484 return false; 486 StyleList styles = MapPaintStyles.getStyles().generateStyles(p, 1.0, null,false).a;485 StyleList styles = MapPaintStyles.getStyles().generateStyles(p, 1.0, false).a; 487 486 if (styles.isEmpty()) { 488 487 return false;
Note:
See TracChangeset
for help on using the changeset viewer.