Changeset 4682 in josm for trunk/src/org/openstreetmap/josm/data/validation
- Timestamp:
- 2011-12-21T10:37:23+01:00 (12 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/data/validation
- Files:
-
- 1 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java
r4448 r4682 48 48 import org.openstreetmap.josm.data.validation.tests.UntaggedNode; 49 49 import org.openstreetmap.josm.data.validation.tests.UntaggedWay; 50 import org.openstreetmap.josm.data.validation.tests.WayConnectedToArea; 50 51 import org.openstreetmap.josm.data.validation.tests.WronglyOrderedWays; 51 52 import org.openstreetmap.josm.gui.MapView.LayerChangeListener; … … 102 103 DeprecatedTags.class, // ID 2101 .. 2199 103 104 OverlappingAreas.class, // ID 2201 .. 2299 105 WayConnectedToArea.class, // ID 2301 .. 2399 104 106 }; 105 107 -
trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java
r4627 r4682 26 26 import org.openstreetmap.josm.data.validation.TestError; 27 27 import org.openstreetmap.josm.gui.mappaint.AreaElemStyle; 28 import org.openstreetmap.josm.gui.mappaint.ElemStyle;29 28 import org.openstreetmap.josm.gui.mappaint.ElemStyles; 30 29 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles; … … 117 116 @Override 118 117 public void visit(Way w) { 119 if (styles != null && !w.isClosed()) { 120 for (ElemStyle s : styles.generateStyles(w, SCALE, null, false).a) { 121 if (s instanceof AreaElemStyle) { 122 List<Node> nodes = w.getNodes(); 123 errors.add(new TestError(this, Severity.WARNING, tr("Area style way is not closed"), NOT_CLOSED, 124 Collections.singletonList(w), Arrays.asList(nodes.get(0), nodes.get(nodes.size() - 1)))); 125 break; 126 } 127 } 118 if (!w.isClosed() && ElemStyles.hasAreaElemStyle(w, false)) { 119 List<Node> nodes = w.getNodes(); 120 errors.add(new TestError(this, Severity.WARNING, tr("Area style way is not closed"), NOT_CLOSED, 121 Collections.singletonList(w), Arrays.asList(nodes.get(0), nodes.get(nodes.size() - 1)))); 128 122 } 129 123 } … … 157 151 if (styles != null) { 158 152 159 AreaElemStyle area = null; 160 boolean areaStyle = false; 161 for (ElemStyle s : styles.generateStyles(r, SCALE, null, false).a) { 162 if (s instanceof AreaElemStyle) { 163 area = (AreaElemStyle) s; 164 areaStyle = true; 165 break; 166 } 167 } 153 AreaElemStyle area = ElemStyles.getAreaElemStyle(r, false); 154 boolean areaStyle = area != null; 168 155 // If area style was not found for relation then use style of ways 169 156 if (area == null) { 170 157 for (Way w : polygon.getOuterWays()) { 171 172 for (ElemStyle s : styles.generateStyles(w, SCALE, null, true).a) { 173 if (s instanceof AreaElemStyle) { 174 area = (AreaElemStyle) s; 175 break; 176 } 177 } 158 area = ElemStyles.getAreaElemStyle(w, true); 178 159 if (area != null) { 179 160 break; … … 189 170 if (area != null) { 190 171 for (Way wInner : polygon.getInnerWays()) { 191 AreaElemStyle areaInner = null; 192 for (ElemStyle s : styles.generateStyles(wInner, SCALE, null, false).a) { 193 if (s instanceof AreaElemStyle) { 194 areaInner = (AreaElemStyle) s; 195 break; 196 } 197 } 172 AreaElemStyle areaInner = ElemStyles.getAreaElemStyle(wInner, false); 198 173 199 174 if (areaInner != null && area.equals(areaInner)) { … … 207 182 if(!areaStyle) { 208 183 for (Way wOuter : polygon.getOuterWays()) { 209 AreaElemStyle areaOuter = null; 210 for (ElemStyle s : styles.generateStyles(wOuter, SCALE, null, false).a) { 211 if (s instanceof AreaElemStyle) { 212 areaOuter = (AreaElemStyle) s; 213 break; 214 } 215 } 184 AreaElemStyle areaOuter = ElemStyles.getAreaElemStyle(wOuter, false); 216 185 if (areaOuter != null && !area.equals(areaOuter)) { 217 186 List<OsmPrimitive> l = new ArrayList<OsmPrimitive>(); -
trunk/src/org/openstreetmap/josm/data/validation/tests/OverlappingAreas.java
r4448 r4682 5 5 import java.util.Collection; 6 6 import java.util.Collections; 7 import org.openstreetmap.josm.data.osm.OsmPrimitive;8 7 import org.openstreetmap.josm.data.osm.QuadBuckets; 9 8 import org.openstreetmap.josm.data.osm.Way; … … 11 10 import org.openstreetmap.josm.data.validation.Test; 12 11 import org.openstreetmap.josm.data.validation.TestError; 13 import org.openstreetmap.josm.gui.mappaint.AreaElemStyle;14 import org.openstreetmap.josm.gui.mappaint.ElemStyle;15 12 import org.openstreetmap.josm.gui.mappaint.ElemStyles; 16 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;17 13 import org.openstreetmap.josm.tools.Geometry; 18 14 import org.openstreetmap.josm.tools.Predicate; … … 23 19 protected static int OVERLAPPING_AREAS = 2201; 24 20 protected QuadBuckets<Way> index = new QuadBuckets<Way>(); 25 private static ElemStyles styles = MapPaintStyles.getStyles();26 21 27 22 public OverlappingAreas() { … … 31 26 @Override 32 27 public void visit(Way w) { 33 if (w.isUsable() && w.isClosed() && hasAreaElemStyle(w)) {28 if (w.isUsable() && w.isClosed() && ElemStyles.hasAreaElemStyle(w, false)) { 34 29 index.add(w); 35 30 } … … 60 55 } 61 56 62 private boolean hasAreaElemStyle(OsmPrimitive p) {63 for (ElemStyle s : styles.generateStyles(p, 1.0, null, false).a) {64 if (s instanceof AreaElemStyle) {65 return true;66 }67 }68 return false;69 }70 57 }
Note:
See TracChangeset
for help on using the changeset viewer.