From f895b3c48ff84f94cc4d9ee2f25b7b9b6967b54e Mon Sep 17 00:00:00 2001
From: Christopher Baines <cbaines8@gmail.com>
Date: Tue, 27 Aug 2013 12:02:24 +0100
Subject: Fix images

---
 amenities.mss        | 21 +++++++++++++--------
 buildings.mss        | 10 ++++++++--
 project.mml          |  5 ++---
 soton-uni-campus.mss |  7 -------
 4 files changed, 23 insertions(+), 20 deletions(-)
 delete mode 100644 soton-uni-campus.mss

diff --git a/amenities.mss b/amenities.mss
index dfbe205..a62014e 100755
--- a/amenities.mss
+++ b/amenities.mss
@@ -103,14 +103,8 @@
   }
 
   [shop = 'convenience'][zoom >= 17]::shop {
-    //point-file: url('symbols/shop_convenience.p.16.png');
-    //point-placement: interior;
-    [name = "SUSU Shop"] { 
-      point-file: url('logos/susu-shop2.png'); 
-      [zoom >= 20] { 
-        point-file: url('logos/susu-shop.png'); 
-      } 
-    } 
+    point-file: url('symbols/shop_convenience.p.16.png');
+    point-placement: interior;
   }
 
   [shop = 'hairdresser'][zoom >= 17]::shop {
@@ -239,4 +233,15 @@
     text-wrap-width: 24;
     text-placement: interior;
   }
+
+  [shop = 'convenience'][zoom >= 17]::shop {
+    point-file: url('symbols/shop_convenience.p.16.png');
+    point-placement: interior;
+    [name = "SUSU Shop"] { 
+      point-file: url('logos/susu-shop2.png'); 
+      [zoom >= 20] { 
+        point-file: url('logos/susu-shop.png'); 
+      } 
+    } 
+  }
 }
diff --git a/buildings.mss b/buildings.mss
index 2d6669a..95cf118 100755
--- a/buildings.mss
+++ b/buildings.mss
@@ -9,7 +9,14 @@
 }
 
 #uni-building-names {
-  [zoom >= 16] {
+  // [loc_ref!='57'] means, don't write the name for building 57, such that the SUSU Shop logo displays 
+  [zoom >= 16][loc_ref!='57'] {
+    [loc_ref='42'][zoom>16] { // SUSU Building
+      point-file: url('logos/susu2.png');
+      [zoom >= 20] {
+        point-file: url('logos/susu.png');
+      }
+    }
     text-name: "[loc_ref]";
     text-placement: interior;
     text-wrap-width: 20;
@@ -26,7 +33,6 @@
       	  text-name: "[loc_ref]";
         }
       }
-
       text-size: 8;
       [zoom >= 18] {
         text-size: 9;
diff --git a/project.mml b/project.mml
index 1c05238..2974cb3 100755
--- a/project.mml
+++ b/project.mml
@@ -26,8 +26,7 @@
     "bicycle-parking.mss",
     "public_transport.mss",
     "water.mss",
-    "sites.mss",
-    "soton-uni-campus.mss"
+    "sites.mss"
   ],
   "Layer": [
     {
@@ -694,4 +693,4 @@
   "description": "",
   "attribution": "Christopher Baines",
   "version": "0.0.1"
-}
\ No newline at end of file
+}
diff --git a/soton-uni-campus.mss b/soton-uni-campus.mss
deleted file mode 100644
index 2064b20..0000000
--- a/soton-uni-campus.mss
+++ /dev/null
@@ -1,7 +0,0 @@
-#soton-uni-campus {
-    polygon-fill: #5383b3;
-    line-width: 1;
-    [landuse = 'residential'] {
-     	polygon-fill: #6699cc;
-   }
-}
-- 
cgit v1.2.3