Changeset 17950 in josm for trunk

Timestamp:

2021-07-05T22:34:56+02:00 (3 years ago)

Author:

Klumbumbus

Message:

fix #20959 - Add landuse=education (icon black/white version of college/universitiy icon, transformed by LeTopographeFou), deprecate landuse=school, allow users to set different colors for landuse=retail and landuse=commercial

Location:

trunk/resources

Files:

• data/defaultpresets.xml (modified) (1 diff)
• data/validator/deprecated.mapcss (modified) (2 diffs)
• data/validator/ignoretags.cfg (modified) (1 diff)
• images/presets/education/education.svg (added)
• styles/standard/elemstyles.mapcss (modified) (1 diff)

trunk/resources/data/defaultpresets.xml

@@ -8449 +8449 @@
             <combo key="residential" text="Type" values="apartments,rural,urban" values_context="landuse type" />
         </item> <!-- Residential Area -->
+        <item name="Education" icon="presets/education/education.svg" type="closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:landuse=education" />
+            <space />
+            <key key="landuse" value="education" />
+            <reference ref="optional_name" />
+        </item> <!-- Education -->
         <item name="Retail" icon="presets/shop/mall.svg" type="closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:landuse=retail" />

trunk/resources/data/validator/deprecated.mapcss

@@ -965 +965 @@
   suggestAlternative: "amenity=school";
   suggestAlternative: "amenity=university";
+  suggestAlternative: "landuse=education";
   group: tr("deprecated tagging");
 }
@@ -2273 +2274 @@
 }
 
+/* #20959 */
+*[landuse=school] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "amenity=college";
+  suggestAlternative: "amenity=school";
+  suggestAlternative: "amenity=university";
+  suggestAlternative: "landuse=education";
+  group: tr("deprecated tagging");
+}
+
 /* When tags are deprecated they should be added to ignoretags.cfg too. */

trunk/resources/data/validator/ignoretags.cfg

@@ -695 +695 @@
 E:service:bicycle:chaintool
 E:building:roof:shape
+K:landuse=school
 ;
 ; Tags not yet decided (to remove from this section when added or moved up when deprecated) 

trunk/resources/styles/standard/elemstyles.mapcss

@@ -3883 +3883 @@
     fill-color: farmyard#f0f0f0;
 }
-area[landuse=retail],
+area[landuse=education] {
+    fill-color: education#f7efb7;
+}
+area[landuse=retail] {
+    fill-color: retail#ffc4ee;
+}
 area[landuse=commercial] {
-    fill-color: retail#ffc4ee;
+    fill-color: commercial#ffc4ee;
 }
 area[landuse=industrial] {