Render brand=* if present for amenity=fuel, shop=supermarket, shop=de…

…partment_store, amenity=bank and amenity=fast_food Renders like one of the following: [name] [brand] [name] + "\n(" + [name] + ")" Which format is chosen, depends on what tags are present (name, brand or both).
gravitystorm · Sep 23, 2014 · e294ae2 · e294ae2
1 parent 3f36931
commit e294ae2
Showing 1 changed file with 35 additions and 3 deletions.
diff --git a/amenity-points.mss b/amenity-points.mss
@@ -421,6 +421,15 @@
   [feature = 'amenity_biergarten'] {
     [zoom >= 17] {
       text-name: "[name]";
+      [feature = 'amenity_fast_food'] {
+        [brand = null],
+        [name = null] {
+          text-name: [name] + [brand];
+        }
+        [brand != null][name != null] {
+          text-name: [name] + "\n(" + [brand] + ")";
+        }
+      }
       text-fill: #734a08;
       text-size: 10;
       text-dy: 9;
@@ -888,7 +897,14 @@
   }
 
   [feature = 'amenity_bank'][zoom >= 17] {
-    text-name: "[name]";
+    text-name: '';
+    [brand = null],
+    [name = null] {
+      text-name: [name] + [brand];
+    }
+    [brand != null][name != null] {
+      text-name: [name] + "\n(" + [brand] + ")";
+    }
     text-size: 9;
     text-fill: black;
     text-dy: 9;
@@ -945,7 +961,16 @@
   [feature = 'amenity_fuel'],
   [feature = 'amenity_bus_station'] {
     [zoom >= 17] {
-      text-name: "[name]";
+      text-name: [name];
+      [feature = 'amenity_fuel'] {
+        [brand = null],
+        [name = null] {
+          text-name: [name] + [brand];
+        }
+        [brand != null][name != null] {
+          text-name: [name] + "\n(" + [brand] + ")";
+        }
+      }
       text-size: 9;
       text-fill: @transportation-text;
       text-dy: 9;
@@ -1159,7 +1184,14 @@
   [feature = 'shop_supermarket'],
   [feature = 'shop_department_store'] {
     [zoom >= 16] {
-      text-name: "[name]";
+      text-name: '';
+      [brand = null],
+      [name = null] {
+        text-name: [name] + [brand];
+      }
+      [brand != null][name != null] {
+        text-name: [name] + "\n(" + [brand] + ")";
+      }
       text-size: 9;
       text-dy: 11;
       text-fill: #939;