]> mj.ucw.cz Git - leo.git/commitdiff
Added property casing-z-index
authorMartin Mares <mj@ucw.cz>
Wed, 3 Jun 2015 23:16:48 +0000 (01:16 +0200)
committerMartin Mares <mj@ucw.cz>
Wed, 3 Jun 2015 23:16:48 +0000 (01:16 +0200)
dict-props.t
sym.c

index f63887feb1997c799490ac310e6aa93a4d7f3c29..2ecc7107f4f47bba43851e654ea28d0ce87ad575 100644 (file)
@@ -2,6 +2,7 @@
 # Please keep sorted
 
 casing-major-z-index
+casing-z-index
 fill-color
 fill-image
 fill-opacity
diff --git a/sym.c b/sym.c
index a395051bc1596ac9c5d31f1375cbd73e90ac84db..7eb66cda678542fb49f18017b230c25feee44987 100644 (file)
--- a/sym.c
+++ b/sym.c
@@ -82,7 +82,12 @@ void sym_plan(struct symbol *sym, z_index_t zindex)
 z_index_t sym_zindex(struct osm_object *o, struct style_info *si, double default_mzi)
 {
   double zi = 0;
-  style_get_number(si, PROP_Z_INDEX, &zi);
+
+  // FIXME: Hack
+  if (default_mzi == 2)
+    style_get_number(si, PROP_CASING_Z_INDEX, &zi);
+  else
+    style_get_number(si, PROP_Z_INDEX, &zi);
 
   // FIXME: Hack
   double fixup = 0;