Fix hmRendered (put it to constant)
This commit is contained in:
Victor Shcherb
parent
791d13d65a
commit
a6c091400c
5 changed files with 47 additions and 46 deletions
|
|
@ -30,6 +30,7 @@ public class RenderingRuleSearchRequest {
|
|||
}
|
||||
}
|
||||
fvalues = new float[props.length];
|
||||
setBooleanFilter(storage.PROPS.R_TEST, true);
|
||||
saveState();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ public class RenderingRuleStorageProperties {
|
|||
public static final String ATTR_BOOL_VALUE = "attrBoolValue";
|
||||
public static final String ATTR_COLOR_VALUE = "attrColorValue";
|
||||
public static final String ATTR_STRING_VALUE = "attrStringValue";
|
||||
public static final String TEST = "test";
|
||||
|
||||
public static final String TEXT_LENGTH = "textLength";
|
||||
public static final String NAME_TAG = "nameTag";
|
||||
|
|
@ -65,6 +66,7 @@ public class RenderingRuleStorageProperties {
|
|||
public static final String SHADOW_LEVEL = "shadowLevel";
|
||||
|
||||
|
||||
public RenderingRuleProperty R_TEST;
|
||||
public RenderingRuleProperty R_ATTR_INT_VALUE;
|
||||
public RenderingRuleProperty R_ATTR_BOOL_VALUE;
|
||||
public RenderingRuleProperty R_ATTR_COLOR_VALUE;
|
||||
|
|
@ -139,6 +141,7 @@ public class RenderingRuleStorageProperties {
|
|||
}
|
||||
|
||||
public void createDefaultRenderingRuleProperties() {
|
||||
R_TEST = registerRuleInternal(RenderingRuleProperty.createInputBooleanProperty(TEST));
|
||||
R_TAG = registerRuleInternal(RenderingRuleProperty.createInputStringProperty(TAG));
|
||||
R_VALUE = registerRuleInternal(RenderingRuleProperty.createInputStringProperty(VALUE));
|
||||
R_ADDITIONAL = registerRuleInternal(RenderingRuleProperty.createAdditionalStringProperty(ADDITIONAL));
|
||||
|
|
|
|||
|
|
@ -10,10 +10,6 @@
|
|||
-->
|
||||
|
||||
<!-- Types : string, int, boolean; possibleValues comma separated possible values for int/string -->
|
||||
<!-- renderingProperty attr="hmRendered" name="Show more map detail" description="Increase amount of map detail shown"
|
||||
type="boolean" possibleValues=""/ -->
|
||||
<!-- renderingProperty attr="roadColors" name="Road color scheme" description="Select road color scheme for specific purpose"
|
||||
type="string" possibleValues="Modified Mapnik,Road atlas style,High contrast roads,Experimental"/ -->
|
||||
<renderingProperty attr="contourLines" name="Show contour lines" description="Select minimum zoom level to display in map if available. Separate SRTM-file may be needed."
|
||||
type="string" possibleValues="--,13,12,11"/>
|
||||
<renderingProperty attr="appMode" name="Rendering mode" description="Map optimization for respective User Profile"
|
||||
|
|
@ -25,11 +21,6 @@
|
|||
<renderingProperty attr="showRoadMaps" name="Show road maps" description="Select how to show maps that have only road information."
|
||||
type="string" possibleValues="Always - never show regular maps,Where no regular map is available,Never"/>
|
||||
|
||||
<!-- This section instead of UI setting for the "Show more map detail" property, so it can be called from depends rendering styles -->
|
||||
<renderingAttribute name="hmRendered">
|
||||
<filter attrBoolValue="false"/>
|
||||
</renderingAttribute>
|
||||
|
||||
<renderingAttribute name="defaultColor">
|
||||
<filter noPolygons="true" attrColorValue="#00ffffff"/>
|
||||
<filter nightMode="true" attrColorValue="#003333"/>
|
||||
|
|
@ -78,11 +69,15 @@
|
|||
<renderingAttribute name="roadsDensityLimitPerTile">
|
||||
<filter appMode="pedestrian" attrIntValue="24"/>
|
||||
<filter appMode="bicycle" attrIntValue="24"/>
|
||||
<filter hmRendered="true" attrIntValue="100"/>
|
||||
<filter test="$hmRendered" attrIntValue="100"/>
|
||||
<filter attrIntValue="12"/>
|
||||
</renderingAttribute>
|
||||
|
||||
<!-- filter does not work for renderingConstant - the last one will be used, but better use separate depends Rendering style -->
|
||||
<!-- This section instead of UI setting for the "Show more map detail" property, so it can be called from depends rendering styles -->
|
||||
<renderingConstant name="hmRendered" value="false"/>
|
||||
|
||||
|
||||
<!-- roadColors="Modified Mapnik" -->
|
||||
<renderingConstant name="motorwayRoadColor" value="#809bff"/>
|
||||
<renderingConstant name="trunkRoadColor" value="#FF8095"/>
|
||||
|
|
@ -917,7 +912,7 @@
|
|||
<filter tag="highway" value="footway"/>
|
||||
<groupFilter>
|
||||
<filter minzoom="14" color="#ECECEC" color_2="#bababa" strokeWidth_2="0.5"/>
|
||||
<filter hmRendered="true" minzoom="13" color="#ECECEC" color_2="#bababa" strokeWidth_2="0.5"/>
|
||||
<filter test="$hmRendered" minzoom="13" color="#ECECEC" color_2="#bababa" strokeWidth_2="0.5"/>
|
||||
</groupFilter>
|
||||
</group>
|
||||
|
||||
|
|
@ -1026,11 +1021,11 @@
|
|||
|
||||
<!-- Built-up areas, night color 66004B -->
|
||||
<group>
|
||||
<filter hmRendered="true" minzoom="10" color="#dfd1d6" tag="landuse" value="industrial"/>
|
||||
<filter test="$hmRendered" minzoom="10" color="#dfd1d6" tag="landuse" value="industrial"/>
|
||||
<filter minzoom="11" color="#dfd1d6" tag="landuse" value="industrial"/>
|
||||
<filter minzoom="12" color="#dfd1d6" tag="landuse" value="railway"/>
|
||||
<filter minzoom="12" color="#9d9d6c" tag="landuse" value="landfill"/>
|
||||
<filter hmRendered="true" minzoom="10" color="#efc8c8" tag="landuse" value="commercial"/>
|
||||
<filter test="$hmRendered" minzoom="10" color="#efc8c8" tag="landuse" value="commercial"/>
|
||||
<filter minzoom="12" color="#efc8c8" tag="landuse" value="commercial"/>
|
||||
<filter minzoom="12" color="#ffffff" color_2="#ff6600" strokeWidth_2="2" tag="landuse" value="construction"/>
|
||||
<filter minzoom="10" color="#CDCDCD" tag="landuse" value="residential"/>
|
||||
|
|
@ -1132,8 +1127,8 @@
|
|||
<filter tag="highway" value="secondary" maxzoom="13" color="$secondaryRoadColor"/>
|
||||
<filter tag="highway" value="secondary_link" maxzoom="13" color="$secondaryRoadColor"/>
|
||||
<groupFilter shadowRadius="1" cap="ROUND">
|
||||
<!-- Too much in Europe? Use only with hmRendered for now -->
|
||||
<filter hmRendered="true" minzoom="9" maxzoom="9" strokeWidth="3"/>
|
||||
<!-- Too many in Europe? Use only with hmRendered for now -->
|
||||
<filter test="$hmRendered" minzoom="9" maxzoom="9" strokeWidth="3"/>
|
||||
<filter minzoom="10" maxzoom="10" strokeWidth="4"/>
|
||||
<filter minzoom="11" maxzoom="11" strokeWidth="5"/>
|
||||
<filter minzoom="12" maxzoom="12" strokeWidth="6"/>
|
||||
|
|
@ -1175,8 +1170,8 @@
|
|||
<filter tag="highway" value="tertiary" color="$tertiaryRoadColor"/>
|
||||
<filter tag="highway" value="tertiary_link" color="$tertiaryRoadColor"/>
|
||||
<groupFilter shadowRadius="1" cap="ROUND">
|
||||
<!-- Too much in Europe? Use only with hmRendered for now -->
|
||||
<filter hmRendered="true" minzoom="10" maxzoom="10" strokeWidth="3"/>
|
||||
<!-- Too many in Europe? Use only with hmRendered for now -->
|
||||
<filter test="$hmRendered" minzoom="10" maxzoom="10" strokeWidth="3"/>
|
||||
<filter minzoom="11" maxzoom="11" strokeWidth="4"/>
|
||||
<filter minzoom="12" maxzoom="12" strokeWidth="5"/>
|
||||
<filter minzoom="13" maxzoom="13" strokeWidth="6"/>
|
||||
|
|
@ -1205,11 +1200,11 @@
|
|||
<filter tag="highway" value="unclassified"/>
|
||||
<filter tag="highway" value="residential"/>
|
||||
<groupFilter color="#ffffff" shadowRadius="1" cap="ROUND">
|
||||
<filter hmRendered="true" minzoom="12" maxzoom="12" strokeWidth="3"/>
|
||||
<filter hmRendered="true" minzoom="13" maxzoom="13" strokeWidth="4"/>
|
||||
<filter test="$hmRendered" minzoom="12" maxzoom="12" strokeWidth="3"/>
|
||||
<filter test="$hmRendered" minzoom="13" maxzoom="13" strokeWidth="4"/>
|
||||
<filter minzoom="13" maxzoom="13" strokeWidth="2" shadowRadius="0"/>
|
||||
<filter color_0="#000000">
|
||||
<filter hmRendered="true" minzoom="14" maxzoom="14" strokeWidth="6"/>
|
||||
<filter test="$hmRendered" minzoom="14" maxzoom="14" strokeWidth="6"/>
|
||||
<filter minzoom="14" maxzoom="14" strokeWidth="3" shadowRadius="0"/>
|
||||
<filter minzoom="15" maxzoom="15" strokeWidth="8"/>
|
||||
<filter minzoom="16" maxzoom="16" strokeWidth="10"/>
|
||||
|
|
@ -1218,7 +1213,7 @@
|
|||
<groupFilter layer="-1" pathEffect="4_4" cap="BUTT"/>
|
||||
<!-- Bridges -->
|
||||
<groupFilter layer="1" shadowRadius="0" cap="SQUARE" cap_0="BUTT">
|
||||
<filter hmRendered="true" minzoom="14" maxzoom="14" strokeWidth_0="8"/>
|
||||
<filter test="$hmRendered" minzoom="14" maxzoom="14" strokeWidth_0="8"/>
|
||||
<filter minzoom="14" maxzoom="14" strokeWidth_0="5"/>
|
||||
<filter minzoom="15" maxzoom="15" strokeWidth_0="10"/>
|
||||
<filter minzoom="16" maxzoom="16" strokeWidth_0="12"/>
|
||||
|
|
@ -1238,9 +1233,9 @@
|
|||
<filter tag="highway" value="living_street"/>
|
||||
<filter tag="highway" value="pedestrian"/>
|
||||
<groupFilter color="#ececec" shadowRadius="1" cap="ROUND">
|
||||
<filter hmRendered="true" minzoom="13" maxzoom="13" strokeWidth="2"/>
|
||||
<filter test="$hmRendered" minzoom="13" maxzoom="13" strokeWidth="2"/>
|
||||
<filter color_0="#000000">
|
||||
<filter hmRendered="true" minzoom="14" maxzoom="14" strokeWidth="3"/>
|
||||
<filter test="$hmRendered" minzoom="14" maxzoom="14" strokeWidth="3"/>
|
||||
<filter minzoom="15" maxzoom="15" strokeWidth="4"/>
|
||||
<filter minzoom="16" maxzoom="16" strokeWidth="5"/>
|
||||
<filter minzoom="17" maxzoom="17" strokeWidth="8"/>
|
||||
|
|
@ -1248,7 +1243,7 @@
|
|||
<groupFilter layer="-1" pathEffect="4_4" cap="BUTT"/>
|
||||
<!-- Bridges -->
|
||||
<groupFilter layer="1" shadowRadius="0" cap="SQUARE" cap_0="BUTT">
|
||||
<filter hmRendered="true" minzoom="14" maxzoom="14" strokeWidth_0="5"/>
|
||||
<filter test="$hmRendered" minzoom="14" maxzoom="14" strokeWidth_0="5"/>
|
||||
<filter minzoom="15" maxzoom="15" strokeWidth_0="6"/>
|
||||
<filter minzoom="16" maxzoom="16" strokeWidth_0="7"/>
|
||||
<filter minzoom="17" maxzoom="17" strokeWidth_0="10"/>
|
||||
|
|
@ -1264,10 +1259,10 @@
|
|||
<!-- Next segment: Highways without grade distinction (cycleway, bridleway, black path): pathEffect 4_2. Base setting for highways with possible grade distinction but none specified (track, byway, red footway): 5_5 -->
|
||||
<group>
|
||||
<filter tag="highway" value="track" color="#996600" pathEffect="4_2">
|
||||
<filter appMode="pedestrian" hmRendered="true" minzoom="14" strokeWidth="2"/>
|
||||
<filter appMode="pedestrian" test="$hmRendered" minzoom="14" strokeWidth="2"/>
|
||||
<filter appMode="pedestrian" minzoom="15" strokeWidth="2"/>
|
||||
<filter hmRendered="true" minzoom="12" maxzoom="12" strokeWidth="0.5"/>
|
||||
<filter hmRendered="true" minzoom="13" strokeWidth="1"/>
|
||||
<filter test="$hmRendered" minzoom="12" maxzoom="12" strokeWidth="0.5"/>
|
||||
<filter test="$hmRendered" minzoom="13" strokeWidth="1"/>
|
||||
<filter minzoom="14" strokeWidth="1"/>
|
||||
<groupFilter>
|
||||
<!-- Dash pattern: solid(100%), long-dashed(77%), short-dashed(63%), dash-dotted(50%), dotted(50%), dotted2(40%), short-dashed-narrow-spaced(66%) for not-specified -->
|
||||
|
|
@ -1281,19 +1276,19 @@
|
|||
|
||||
<!-- byway is deprecated tag, describes UK-only road. Proper tag should be highway=track or highway=path -->
|
||||
<filter tag="highway" value="byway" color="#996600" pathEffect="5_5">
|
||||
<filter appMode="pedestrian" hmRendered="true" minzoom="14" strokeWidth="2"/>
|
||||
<filter appMode="pedestrian" test="$hmRendered" minzoom="14" strokeWidth="2"/>
|
||||
<filter appMode="pedestrian" minzoom="15" strokeWidth="2"/>
|
||||
<filter appMode="bicycle" minzoom="14" strokeWidth="2"/>
|
||||
<filter hmRendered="true" minzoom="12" maxzoom="12" strokeWidth="0.5"/>
|
||||
<filter hmRendered="true" minzoom="13" strokeWidth="1"/>
|
||||
<filter test="$hmRendered" minzoom="12" maxzoom="12" strokeWidth="0.5"/>
|
||||
<filter test="$hmRendered" minzoom="13" strokeWidth="1"/>
|
||||
<filter minzoom="14" strokeWidth="1"/>
|
||||
</filter>
|
||||
|
||||
<filter tag="highway" value="path" color="#000000" pathEffect="4_2">
|
||||
<filter appMode="pedestrian" hmRendered="true" minzoom="14" strokeWidth="2"/>
|
||||
<filter appMode="pedestrian" test="$hmRendered" minzoom="14" strokeWidth="2"/>
|
||||
<filter appMode="pedestrian" minzoom="15" strokeWidth="2"/>
|
||||
<filter hmRendered="true" minzoom="12" maxzoom="12" strokeWidth="0.5"/>
|
||||
<filter hmRendered="true" minzoom="13" strokeWidth="1"/>
|
||||
<filter test="$hmRendered" minzoom="12" maxzoom="12" strokeWidth="0.5"/>
|
||||
<filter test="$hmRendered" minzoom="13" strokeWidth="1"/>
|
||||
<filter minzoom="14" strokeWidth="1"/>
|
||||
<groupFilter>
|
||||
<!-- Dash pattern: solid(100%), long-dashed(77%), short-dashed(63%), dash-dotted(50%), dotted(50%), dotted2(40%), short-dashed-narrow-spaced(66%) for not-specified -->
|
||||
|
|
@ -1310,32 +1305,32 @@
|
|||
|
||||
<filter tag="highway" value="cycleway" color="#0000ff" pathEffect="4_2">
|
||||
<filter appMode="bicycle" minzoom="14" strokeWidth="2"/>
|
||||
<filter appMode="pedestrian" hmRendered="true" minzoom="14" strokeWidth="2"/>
|
||||
<filter hmRendered="true" minzoom="12" maxzoom="12" strokeWidth="0.5"/>
|
||||
<filter hmRendered="true" minzoom="13" strokeWidth="1"/>
|
||||
<filter appMode="pedestrian" test="$hmRendered" minzoom="14" strokeWidth="2"/>
|
||||
<filter test="$hmRendered" minzoom="12" maxzoom="12" strokeWidth="0.5"/>
|
||||
<filter test="$hmRendered" minzoom="13" strokeWidth="1"/>
|
||||
<filter minzoom="14" strokeWidth="1"/>
|
||||
</filter>
|
||||
|
||||
<filter tag="highway" value="footway" color="#fa5073" pathEffect="4_2">
|
||||
<filter appMode="pedestrian" hmRendered="true" minzoom="14" strokeWidth="2"/>
|
||||
<filter appMode="pedestrian" test="$hmRendered" minzoom="14" strokeWidth="2"/>
|
||||
<filter appMode="pedestrian" minzoom="15" strokeWidth="2"/>
|
||||
<filter hmRendered="true" minzoom="12" maxzoom="12" strokeWidth="0.5"/>
|
||||
<filter hmRendered="true" minzoom="13" strokeWidth="1"/>
|
||||
<filter test="$hmRendered" minzoom="12" maxzoom="12" strokeWidth="0.5"/>
|
||||
<filter test="$hmRendered" minzoom="13" strokeWidth="1"/>
|
||||
<filter minzoom="16" strokeWidth="1"/>
|
||||
</filter>
|
||||
|
||||
<filter tag="highway" value="steps" color="#fa5073" pathEffect="1_2">
|
||||
<filter appMode="pedestrian" hmRendered="true" minzoom="14" strokeWidth="4" pathEffect="2_2"/>
|
||||
<filter appMode="pedestrian" test="$hmRendered" minzoom="14" strokeWidth="4" pathEffect="2_2"/>
|
||||
<filter appMode="pedestrian" minzoom="15" strokeWidth="4" pathEffect="2_2"/>
|
||||
<filter hmRendered="true" minzoom="14" strokeWidth="4"/>
|
||||
<filter test="$hmRendered" minzoom="14" strokeWidth="4"/>
|
||||
<filter minzoom="16" strokeWidth="4"/>
|
||||
</filter>
|
||||
|
||||
<filter tag="highway" value="bridleway" color="#339900" pathEffect="4_2">
|
||||
<filter appMode="pedestrian" hmRendered="true" minzoom="14" strokeWidth="2"/>
|
||||
<filter appMode="pedestrian" test="$hmRendered" minzoom="14" strokeWidth="2"/>
|
||||
<filter appMode="pedestrian" minzoom="15" strokeWidth="2"/>
|
||||
<filter hmRendered="true" minzoom="12" maxzoom="12" strokeWidth="0.5"/>
|
||||
<filter hmRendered="true" minzoom="13" strokeWidth="1"/>
|
||||
<filter test="$hmRendered" minzoom="12" maxzoom="12" strokeWidth="0.5"/>
|
||||
<filter test="$hmRendered" minzoom="13" strokeWidth="1"/>
|
||||
<filter minzoom="16" strokeWidth="1"/>
|
||||
</filter>
|
||||
|
||||
|
|
@ -1604,5 +1599,4 @@
|
|||
<filter noAdminboundaries="false" tag="boundary" value="national_park" minzoom="7" maxzoom="9" color="#a009dd09" strokeWidth="1.5" pathEffect="4_1"/>
|
||||
<filter noAdminboundaries="false" tag="boundary" value="national_park" minzoom="10" color="#a009dd09" strokeWidth="3" pathEffect="4_1"/>
|
||||
</line>
|
||||
|
||||
</renderingStyle>
|
||||
|
|
@ -456,6 +456,7 @@ RenderingRuleSearchRequest::RenderingRuleSearchRequest(RenderingRulesStorage* st
|
|||
values[it->second->id] = -1;
|
||||
}
|
||||
}
|
||||
setBooleanFilter(PROPS->R_TEST, true);
|
||||
saveState();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -178,6 +178,7 @@ public:
|
|||
class RenderingRulesStorageProperties
|
||||
{
|
||||
public:
|
||||
RenderingRuleProperty* R_TEST;
|
||||
RenderingRuleProperty* R_TEXT_LENGTH;
|
||||
RenderingRuleProperty* R_REF;
|
||||
RenderingRuleProperty* R_TEXT_SHIELD;
|
||||
|
|
@ -294,6 +295,7 @@ public:
|
|||
}
|
||||
|
||||
void createDefaultProperties() {
|
||||
R_TEST = registerRuleInternal(RenderingRuleProperty::createInputBooleanProperty("test"));
|
||||
R_TAG = registerRuleInternal(RenderingRuleProperty::createInputStringProperty("tag"));
|
||||
R_VALUE = registerRuleInternal(RenderingRuleProperty::createInputStringProperty("value"));
|
||||
R_ADDITIONAL = registerRuleInternal(RenderingRuleProperty::createInputStringProperty("additional"));
|
||||
|
|
|
|||
Loading…
Reference in a new issue