Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java (revision 4317) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java (revision 4318) @@ -24,5 +24,8 @@ private boolean drawMultipolygon; - private int cacheIdx; + private int cacheIdx = 1; + + private boolean defaultNodes, defaultLines; + private int defaultNodesIdx, defaultLinesIdx; public ElemStyles() @@ -39,8 +42,22 @@ } + /** + * Create the list of styles for one primitive. + * + * @param osm the primitive + * @param scale the scale (in meters per 100 pixel) + * @param nc + * @return + */ public StyleList get(OsmPrimitive osm, double scale, NavigatableComponent nc) { return getStyleCacheWithRange(osm, scale, nc).a; } + /** + * Create the list of styles and its valid scale range for one primitive. + * + * Automatically adds default styles in case no proper style was found. + * Uses the cache, if possible, and saves the results to the cache. + */ public Pair getStyleCacheWithRange(OsmPrimitive osm, double scale, NavigatableComponent nc) { if (osm.mappaintStyle == null || osm.mappaintCacheIdx != cacheIdx) { @@ -52,5 +69,5 @@ } Pair p = getImpl(osm, scale, nc); - if (osm instanceof Node) { + if (osm instanceof Node && isDefaultNodes()) { boolean hasNonModifier = false; for (ElemStyle s : p.a) { @@ -63,5 +80,5 @@ p.a = new StyleList(p.a, NodeElemStyle.SIMPLE_NODE_ELEMSTYLE); } - } else if (osm instanceof Way) { + } else if (osm instanceof Way && isDefaultLines()) { boolean hasProperLineStyle = false; for (ElemStyle s : p.a) { @@ -73,5 +90,6 @@ if (!hasProperLineStyle) { AreaElemStyle area = Utils.find(p.a, AreaElemStyle.class); - LineElemStyle line = (area == null ? LineElemStyle.UNTAGGED_WAY : LineElemStyle.createSimpleLineStyle(area.color, true)); + LineElemStyle line = null; + line = (area == null ? LineElemStyle.UNTAGGED_WAY : LineElemStyle.createSimpleLineStyle(area.color, true)); p.a = new StyleList(p.a, line); } @@ -82,4 +100,33 @@ } + /** + * Create the list of styles and its valid scale range for one primitive. + * + * This method does multipolygon handling. + * + * + * There are different tagging styles for multipolygons, that have to be respected: + * - tags on the relation + * - tags on the outer way + * - tags on both, the outer and the inner way (very old style) + * + * If the primitive is a way, look for multipolygon parents. In case it + * is indeed member of some multipolygon as role "outer", all area styles + * are removed. (They apply to the multipolygon area.) + * Outer ways can have their own independent line styles, e.g. a road as + * boundary of a forest. Otherwise, in case, the way does not have an + * independent line style, take a line style from the multipolygon. + * If the multipolygon does not have a line style either, at least create a + * default line style from the color of the area. + * + * Now consider the case that the way is not an outer way of any multipolygon, + * but is member of a multipolygon as "inner". + * First, the style list is regenerated, considering only tags of this way + * minus the tags of outer way of the multipolygon (to care for the "very + * old style"). + * Then check, if the way describes something in its own right. (linear feature + * or area) If not, add a default line style from the area color of the multipolygon. + * + */ private Pair getImpl(OsmPrimitive osm, double scale, NavigatableComponent nc) { if (osm instanceof Node) @@ -131,5 +178,5 @@ p.b = Range.cut(p.b, mpElemStyles.b); break; - } else if (wayColor == null) { + } else if (wayColor == null && isDefaultLines()) { AreaElemStyle mpArea = Utils.find(mpElemStyles.a, AreaElemStyle.class); if (mpArea != null) { @@ -142,16 +189,20 @@ } if (isOuterWayOfSomeMP) { - boolean hasLineStyle = false; - for (ElemStyle s : p.a) { - if (s.isProperLineStyle()) { - hasLineStyle = true; - break; - } - } - if (!hasLineStyle) { - p.a = new StyleList(p.a, LineElemStyle.createSimpleLineStyle(wayColor, true)); + if (isDefaultLines()) { + boolean hasLineStyle = false; + for (ElemStyle s : p.a) { + if (s.isProperLineStyle()) { + hasLineStyle = true; + break; + } + } + if (!hasLineStyle) { + p.a = new StyleList(p.a, LineElemStyle.createSimpleLineStyle(wayColor, true)); + } } return p; } + + if (!isDefaultLines()) return p; for (OsmPrimitive referrer : osm.getReferrers()) { @@ -213,4 +264,9 @@ /** + * Create the list of styles and its valid scale range for one primitive. + * + * Loops over the list of style sources, to generate the map of properties. + * From these properties, it generates the different types of styles. + * * @param multipolyOuterWay support for a very old multipolygon tagging style * where you add the tags both to the outer and the inner way. @@ -268,4 +324,42 @@ } + /** + * Draw a default node symbol for nodes that have no style? + */ + private boolean isDefaultNodes() { + if (defaultNodesIdx == cacheIdx) { + return defaultNodes; + } + defaultNodes = fromCanvas("default-points", true, Boolean.class); + defaultNodesIdx = cacheIdx; + return defaultNodes; + } + + /** + * Draw a default line for ways that do not have an own line style? + */ + private boolean isDefaultLines() { + if (defaultLinesIdx == cacheIdx) { + return defaultLines; + } + defaultLines = fromCanvas("default-lines", true, Boolean.class); + defaultLinesIdx = cacheIdx; + return defaultLines; + } + + private T fromCanvas(String key, T def, Class c) { + MultiCascade mc = new MultiCascade(); + Relation r = new Relation(); + r.put("#canvas", "query"); + + for (StyleSource s : styleSources) { + if (s.active) { + s.apply(mc, r, 1, null, false); + } + } + T res = mc.getCascade("default").get(key, def, c); + return res; + } + public boolean isDrawMultipolygon() { return drawMultipolygon; Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/NodeElemStyle.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/NodeElemStyle.java (revision 4317) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/NodeElemStyle.java (revision 4318) @@ -164,5 +164,5 @@ } - private static NodeElemStyle create(Environment env, boolean allowOnlyText) { + private static NodeElemStyle create(Environment env, boolean allowDefault) { initDefaultParameters(); Cascade c = env.mc.getCascade(env.layer); @@ -175,5 +175,5 @@ NodeTextElement text = null; - TextElement te = TextElement.create(c, DEFAULT_TEXT_COLOR, symbol == null && icon == null); + TextElement te = TextElement.create(c, DEFAULT_TEXT_COLOR, symbol == null && icon == null && allowDefault); // optimization: if we neither have a symbol, nor an icon, nor a text element // we don't have to check for the remaining style properties and we don't Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java (revision 4317) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java (revision 4318) @@ -265,14 +265,17 @@ public boolean matchesBase(Environment e){ - if (base.equals("*")) - return true; - if (base.equals("area")) { - if (e.osm instanceof Way) + if (e.osm instanceof Node) { + return base.equals("node") || base.equals("*"); + } else if (e.osm instanceof Way) { + return base.equals("way") || base.equals("area") || base.equals("*"); + } else if (e.osm instanceof Relation) { + if (base.equals("area")) { + return ((Relation) e.osm).isMultipolygon(); + } else if (base.equals("relation")) { return true; - if (e.osm instanceof Relation && ((Relation) e.osm).isMultipolygon()) - return true; - } - if (base.equals(OsmPrimitiveType.from(e.osm).getAPIName())) - return true; + } else if (base.equals("canvas")) { + return e.osm.get("#canvas") != null; + } + } return false; }