Changeset 7998 in josm for trunk/data


Ignore:
Timestamp:
2015-02-02T17:29:58+01:00 (10 years ago)
Author:
Klumbumbus
Message:

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

Location:
trunk/data
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/data/defaultpresets.xml

    r7997 r7998  
    313313    <preset_link preset_name="Contact (Common Schema)" />
    314314  </chunk>
     315  <chunk id="link_address">
     316    <preset_link preset_name="Addresses" />
     317  </chunk>
    315318  <!--  Groups -->
    316319  <group name="Highways" icon="presets/way_secondary.png">
    … …  
    22182221            </optional>
    22192222        </item> <!-- Cable Car -->
    2220                 <item name="Chair Lift" icon="presets/chair_lift.png" type="way" preset_name_label="true">
     2223        <item name="Chair Lift" icon="presets/chair_lift.png" type="way" preset_name_label="true">
    22212224            <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift"
    22222225                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:aerialway=chair_lift" />
    … …  
    34623465            <key key="amenity" value="cinema" />
    34633466            <reference ref="name_operator_oh" />
     3467                        <combo key="wheelchair" text="Wheelchair" values="no,limited,yes" />
     3468            <check key="drive_in" text="Drive-in theater" />
     3469            <check key="cinema:3D" text="3D" />
     3470            <text key="screen" text="Number of screens" />
     3471            <text key="min_age" text="Minimum age" />
     3472                        <reference ref="link_address" />
    34643473            <reference ref="link_contact" />
    34653474        </item> <!-- Movie Theater/Cinema -->
    … …  
    63156324        </item> <!-- Pawnbroker -->
    63166325    </group> <!-- Cash -->
    6317     <group name="Home decoration" icon="styles/standard/shop/interior_decoration.svg"> 
     6326    <group name="Home decoration" icon="styles/standard/shop/interior_decoration.svg">
    63186327        <item name="Furniture" icon="styles/standard/shop/furniture.png" type="node,closedway" preset_name_label="true">
    63196328            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=furniture"

  • trunk/data/validator/numeric.mapcss

    r7937 r7998  
    141141}
    142142
    143 /* lanes* must be an integer positive number only, see #10837 */
    144 way[highway][lanes][lanes !~ /^[1-9]([0-9]*)$/],
    145 way[highway]["lanes:backward"]["lanes:backward" !~ /^[1-9]([0-9]*)$/],
    146 way[highway]["lanes:forward"]["lanes:forward" !~ /^[1-9]([0-9]*)$/] {
    147   throwError: tr("{0} must be a positive integer number", "{1.key}");
     143/* must be an integer positive number only and not 0, see #10837 (lanes), #11055 (screen) */
     144way[lanes][lanes !~ /^[1-9]([0-9]*)$/][highway],
     145way["lanes:backward"]["lanes:backward" !~ /^[1-9]([0-9]*)$/][highway],
     146way["lanes:forward"]["lanes:forward" !~ /^[1-9]([0-9]*)$/][highway],
     147*[screen][screen !~ /^[1-9]([0-9]*)$/][amenity=cinema] {
     148  throwError: tr("{0} must be a positive integer number", "{0.key}");
    148149  assertMatch: "way highway=residential lanes=-1";
    149150  assertMatch: "way highway=residential lanes=5.5";
    … …  
    152153  assertMatch: "way highway=residential lanes:backward=-1";
    153154  assertNoMatch: "way highway=residential lanes=1";
     155  assertMatch: "node amenity=cinema screen=led";
     156  assertNoMatch: "node amenity=cinema screen=8";
    154157}
Note: See TracChangeset for help on using the changeset viewer.