Changeset 14552 in josm

Timestamp:

2018-12-11T22:34:04+01:00 (6 years ago)

Author:

Klumbumbus

Message:

• see #16301 - make id mandatory
• see #17058 - add asserts to territories.mapcss

Location:

trunk/data

Files:

• maps.xsd (modified) (1 diff)
• validator/territories.mapcss (modified) (1 diff)

trunk/data/maps.xsd

@@ -643 +643 @@
                             <xs:element name="description" minOccurs="0" type="tns:description" />
                             <!-- A unique id for the imagery source -->
-                            <xs:element name="id" minOccurs="0" maxOccurs="1" type="tns:id" />
+                            <xs:element name="id" minOccurs="1" maxOccurs="1" type="tns:id" />
                             <!-- Historic id for the imagery source -->
                             <xs:element name="oldid" minOccurs="0" maxOccurs="unbounded" type="tns:oldid" />

trunk/data/validator/territories.mapcss

@@ -11 +11 @@
 *[name =~ /(?i).*Strasse.*/][name !~ /(?i).*Strasser.*/][inside("DE,AT")] {
   throwError: tr("street name contains ss");
+  assertMatch: "way name=Hauptstrasse";
+  assertNoMatch: "way name=Hauptstraße";
+  assertNoMatch: "way name=Kapitän-Strasser-Straße";
+  assertNoMatch: "way name=Peter-Strasser-Platz";
+  
 }
 *[addr:street =~ /(?i).*Straße.*/][inside("LI,CH")],
 *[name =~ /(?i).*Straße.*/][inside("LI,CH")] {
   throwError: tr("street name contains ß");
+  assertMatch: "way name=Hauptstraße";
+  assertNoMatch: "way name=Hauptstrasse";
 }