Index: trunk/data/validator/deprecated.mapcss
===================================================================
--- trunk/data/validator/deprecated.mapcss	(revision 15360)
+++ trunk/data/validator/deprecated.mapcss	(revision 15372)
@@ -189,5 +189,19 @@
   fixAdd: "power=substation";
 }
-  
+
+*[location=rooftop] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "location=roof";
+  group: tr("deprecated tagging");
+  fixAdd: "location=roof";
+}
+
+*[generator:location=*] {
+  throwWarning: tr("{0} is deprecated", "{0.key}");
+  suggestAlternative: "location";
+  group: tr("deprecated tagging");
+  fixChangeKey: "generator:location => location";
+}
+
 *[generator:method=dam] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");