Z-index fixups

diff --git a/TODO b/TODO
index 54c3c1ae39878c2dc7c83b9939831864cb9f7e97..dd0e7067e21f786d401a33c78811c27bd46a1e7f 100644 (file)
--- a/TODO
+++ b/TODO
@@ -7,3 +7,6 @@
 
 - Add icon-anchor-* properties like text-anchor-*
   (for now, we have only icon-offset-*)
+
+- do something with (major-)z-index-fixup ... better typesetting of bridges?
+- way[layer="2"] requires quotes

diff --git a/dict-props.t b/dict-props.t
index f2132d45e5300994268119cb7bd19b1fe9bbd1c9..f63887feb1997c799490ac310e6aa93a4d7f3c29 100644 (file)
--- a/dict-props.t
+++ b/dict-props.t
@@ -20,6 +20,7 @@ icon-offset-y
 icon-opacity
 icon-width
 major-z-index
+major-z-index-fixup
 object-z-index
 repeat-image
 repeat-image-align
@@ -50,6 +51,7 @@ text-offset-y
 text-opacity
 text-position
 z-index
+z-index-fixup
 
 # The following properties come in couples, which must not be split
 # (for reasons, see their use in sym-gen.c)

diff --git a/sym.c b/sym.c
index 00d89416b3e798d4ce3f16405e2d420847771aaa..a395051bc1596ac9c5d31f1375cbd73e90ac84db 100644 (file)
--- a/sym.c
+++ b/sym.c
@@ -83,6 +83,12 @@ z_index_t sym_zindex(struct osm_object *o, struct style_info *si, double default
 {
   double zi = 0;
   style_get_number(si, PROP_Z_INDEX, &zi);
+
+  // FIXME: Hack
+  double fixup = 0;
+  style_get_number(si, PROP_Z_INDEX_FIXUP, &fixup);
+  zi += fixup;
+
   double zi2 = CLAMP(zi, -100, 100);
   if (zi2 != zi)
     osm_obj_warn(o, "z-index clipped from %.6g to %.6g", zi, zi2);
@@ -109,6 +115,12 @@ z_index_t sym_zindex(struct osm_object *o, struct style_info *si, double default
     }
   else
     style_get_number(si, PROP_MAJOR_Z_INDEX, &mzi);
+
+  // FIXME: Hack
+  fixup = 0;
+  style_get_number(si, PROP_MAJOR_Z_INDEX_FIXUP, &fixup);
+  mzi += fixup;
+
   double mzi2 = CLAMP(mzi, -100, 100);
   if (mzi2 != mzi)
     osm_obj_warn(o, "major-z-index clipped from %.6g to %.6g", mzi, mzi2);