Changeset 7998 in josm

Timestamp:

2015-02-02T17:29:58+01:00 (9 years ago)

Author:

Klumbumbus

Message:

fix #11055 - Improve Cinema preset, add validator, typos

Location:

trunk/data

Files:

• defaultpresets.xml (modified) (4 diffs)
• validator/numeric.mapcss (modified) (2 diffs)

trunk/data/defaultpresets.xml

@@ -313 +313 @@
     <preset_link preset_name="Contact (Common Schema)" />
   </chunk>
+  <chunk id="link_address">
+    <preset_link preset_name="Addresses" />
+  </chunk>
   <!--  Groups -->
   <group name="Highways" icon="presets/way_secondary.png">
@@ -2218 +2221 @@
             </optional>
         </item> <!-- Cable Car -->
-                <item name="Chair Lift" icon="presets/chair_lift.png" type="way" preset_name_label="true">
+        <item name="Chair Lift" icon="presets/chair_lift.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:aerialway=chair_lift" />
@@ -3462 +3465 @@
             <key key="amenity" value="cinema" />
             <reference ref="name_operator_oh" />
+                        <combo key="wheelchair" text="Wheelchair" values="no,limited,yes" />
+            <check key="drive_in" text="Drive-in theater" />
+            <check key="cinema:3D" text="3D" />
+            <text key="screen" text="Number of screens" />
+            <text key="min_age" text="Minimum age" />
+                        <reference ref="link_address" />
             <reference ref="link_contact" />
         </item> <!-- Movie Theater/Cinema -->
@@ -6315 +6324 @@
         </item> <!-- Pawnbroker -->
     </group> <!-- Cash -->
-    <group name="Home decoration" icon="styles/standard/shop/interior_decoration.svg">  
+    <group name="Home decoration" icon="styles/standard/shop/interior_decoration.svg">
         <item name="Furniture" icon="styles/standard/shop/furniture.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=furniture"

trunk/data/validator/numeric.mapcss

@@ -141 +141 @@
 }
 
-/* lanes* must be an integer positive number only, see #10837 */
-way[highway][lanes][lanes !~ /^[1-9]([0-9]*)$/],
-way[highway]["lanes:backward"]["lanes:backward" !~ /^[1-9]([0-9]*)$/],
-way[highway]["lanes:forward"]["lanes:forward" !~ /^[1-9]([0-9]*)$/] {
-  throwError: tr("{0} must be a positive integer number", "{1.key}");
+/* must be an integer positive number only and not 0, see #10837 (lanes), #11055 (screen) */
+way[lanes][lanes !~ /^[1-9]([0-9]*)$/][highway],
+way["lanes:backward"]["lanes:backward" !~ /^[1-9]([0-9]*)$/][highway],
+way["lanes:forward"]["lanes:forward" !~ /^[1-9]([0-9]*)$/][highway],
+*[screen][screen !~ /^[1-9]([0-9]*)$/][amenity=cinema] {
+  throwError: tr("{0} must be a positive integer number", "{0.key}");
   assertMatch: "way highway=residential lanes=-1";
   assertMatch: "way highway=residential lanes=5.5";
@@ -152 +153 @@
   assertMatch: "way highway=residential lanes:backward=-1";
   assertNoMatch: "way highway=residential lanes=1";
+  assertMatch: "node amenity=cinema screen=led";
+  assertNoMatch: "node amenity=cinema screen=8";
 }