Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Libraries
KOSMIndoorMap
Commits
f073f240
Commit
f073f240
authored
Jun 11, 2021
by
Volker Krause
Browse files
Handle default layer selector
parent
8303479c
Pipeline
#65283
passed with stage
in 23 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
autotests/data/mapcss/parser-test.mapcss
View file @
f073f240
...
@@ -134,3 +134,7 @@ way[railway=tram]::tram {
...
@@ -134,3 +134,7 @@ way[railway=tram]::tram {
color: #303030;
color: #303030;
z-index: 1;
z-index: 1;
}
}
// default layer selector
node::default {
icon-image: "bla";
}
autotests/data/mapcss/parser-test.mapcss.ref
View file @
f073f240
...
@@ -157,3 +157,8 @@ way[railway=tram]::tram
...
@@ -157,3 +157,8 @@ way[railway=tram]::tram
z-index: 1;
z-index: 1;
}
}
node
{
icon-image: "bla";
}
src/map/style/mapcssparser.cpp
View file @
f073f240
...
@@ -154,5 +154,8 @@ ClassSelectorKey MapCSSParser::makeClassSelector(const char *str, std::size_t le
...
@@ -154,5 +154,8 @@ ClassSelectorKey MapCSSParser::makeClassSelector(const char *str, std::size_t le
LayerSelectorKey
MapCSSParser
::
makeLayerSelector
(
const
char
*
str
,
std
::
size_t
len
)
LayerSelectorKey
MapCSSParser
::
makeLayerSelector
(
const
char
*
str
,
std
::
size_t
len
)
{
{
if
(
!
str
||
std
::
strcmp
(
str
,
"default"
)
==
0
)
{
return
{};
}
return
MapCSSStylePrivate
::
get
(
m_currentStyle
)
->
m_layerSelectorRegistry
.
makeKey
(
str
,
len
,
OSM
::
StringMemory
::
Transient
);
return
MapCSSStylePrivate
::
get
(
m_currentStyle
)
->
m_layerSelectorRegistry
.
makeKey
(
str
,
len
,
OSM
::
StringMemory
::
Transient
);
}
}
src/map/style/mapcssparser.y
View file @
f073f240
...
@@ -198,9 +198,7 @@ BasicSelector:
...
@@ -198,9 +198,7 @@ BasicSelector:
$$->setObjectType($I.str, $I.len);
$$->setObjectType($I.str, $I.len);
$$->setZoomRange($Z.low, $Z.high);
$$->setZoomRange($Z.low, $Z.high);
$$->setConditions($T);
$$->setConditions($T);
if ($L.str) {
$$->setLayer(parser->makeLayerSelector($L.str, $L.len));
$$->setLayer(parser->makeLayerSelector($L.str, $L.len));
}
}
}
| T_STAR ClassSelector[C] ZoomRange[Z] Tests[T] LayerSelector[L] {
| T_STAR ClassSelector[C] ZoomRange[Z] Tests[T] LayerSelector[L] {
$$ = new MapCSSBasicSelector;
$$ = new MapCSSBasicSelector;
...
@@ -210,9 +208,7 @@ BasicSelector:
...
@@ -210,9 +208,7 @@ BasicSelector:
}
}
$$->setZoomRange($Z.low, $Z.high);
$$->setZoomRange($Z.low, $Z.high);
$$->setConditions($T);
$$->setConditions($T);
if ($L.str) {
$$->setLayer(parser->makeLayerSelector($L.str, $L.len));
$$->setLayer(parser->makeLayerSelector($L.str, $L.len));
}
}
}
;
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment