Changeset 5376 in josm


Ignore:
Timestamp:
Jul 28, 2012 3:59:38 PM (11 months ago)
Author:
Don-vip
Message:

see #7907 - MapCSS fixes

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/gui/mappaint/AreaElemStyle.java

    r5342 r5376  
    4949 
    5050            fillImage.alpha = Math.min(255, Math.max(0, Integer.valueOf(Main.pref.getInteger("mappaint.fill-image-alpha", 255)))); 
    51             Integer pAlpha = Utils.color_float2int(c.get("fill-opacity", null, float.class)); 
     51            Integer pAlpha = Utils.color_float2int(c.get(FILL_OPACITY, null, float.class)); 
    5252            if (pAlpha != null) { 
    5353                fillImage.alpha = pAlpha; 
    … …  
    5757            if (color != null) { 
    5858                int alpha = Math.min(255, Math.max(0, Integer.valueOf(Main.pref.getInteger("mappaint.fillalpha", 50)))); 
    59                 Integer pAlpha = Utils.color_float2int(c.get("fill-opacity", null, float.class)); 
     59                Integer pAlpha = Utils.color_float2int(c.get(FILL_OPACITY, null, float.class)); 
    6060                if (pAlpha != null) { 
    6161                    alpha = pAlpha; 

  • trunk/src/org/openstreetmap/josm/gui/mappaint/StyleKeys.java

    r5342 r5376  
    1111    public static final String FILL_COLOR = "fill-color"; 
    1212    public static final String FILL_IMAGE = "fill-image"; 
     13    public static final String FILL_OPACITY = "fill-opacity"; 
    1314    public static final String ICON_IMAGE = "icon-image"; 
    1415    public static final String MODIFIER = "modifier"; 

  • trunk/styles/standard/potlatch2.mapcss

    r5218 r5376  
    373373way[boundary=administrative]                { z-index: 5; color: purple; width: 2; opacity: 0.2; dashes: 24,4; z-index: 4;} 
    374374way[boundary=administrative][waterway]      { z-index: 5; opacity: 0.8; z-index: 4; dashes: 24,4; width: 6; } 
    375 area[landuse=cemetery]:closed                                           { color: #664466; width: 2; fill-color: color: #664466; opacity: 0.2; prop_area_small_name : 1;} 
     375area[landuse=cemetery]:closed                                           { color: #664466; width: 2; fill-color: #664466; opacity: 0.2; prop_area_small_name : 1;} 
    376376/* Addressing. Nodes with addresses *and* match POIs should have a poi icon, so we put addressing first */ 
    377377/* Route relations */ 

  • trunk/styles_nodist/potlatch2/patched/core_landuse.css

    r5215 r5376  
    4444way[boundary=administrative]                { z-index: 5; color: purple; width: 2; opacity: 0.2; dashes: 24,4; z-index: 4;} 
    4545way[boundary=administrative][waterway]      { z-index: 5; opacity: 0.8; z-index: 4; dashes: 24,4; width: 6; } 
    46 area[landuse=cemetery]:closed                                           { color: #664466; width: 2; fill-color: color: #664466; opacity: 0.2; prop_area_small_name : 1;} 
     46area[landuse=cemetery]:closed                                           { color: #664466; width: 2; fill-color: #664466; opacity: 0.2; prop_area_small_name : 1;} 
    4747/* Addressing. Nodes with addresses *and* match POIs should have a poi icon, so we put addressing first */ 

  • trunk/styles_nodist/potlatch2/source/core_landuse.css

    r5215 r5376  
    4040way[boundary=administrative]                { color: purple; width: 2; opacity: 0.2; dashes: 24,4; z-index: 4;} 
    4141way[boundary=administrative][waterway]      { opacity: 0.8; z-index: 4; dashes: 24,4; width: 6; } 
    42 way[landuse=cemetery]                                           { color: #664466; width: 2; fill-color: color: #664466; opacity: 0.2; set .area_small_name;} 
     42way[landuse=cemetery]                                           { color: #664466; width: 2; fill-color: #664466; opacity: 0.2; set .area_small_name;} 
    4343/* Addressing. Nodes with addresses *and* match POIs should have a poi icon, so we put addressing first */ 
Note: See TracChangeset for help on using the changeset viewer.