diff --git a/schema/README.md b/schema/README.md index 0d4525e..e81de2a 100644 --- a/schema/README.md +++ b/schema/README.md @@ -21,13 +21,13 @@ evolve as the concept of MapML evolves. mapml.rnc (a [RelaxNG](http://www.relaxng.org/compact-tutorial-20030326.html) compact syntax schema) and mapml.sch (post-schema validation MapML schematron rules) are intended to be applied in that order, to validate a "stand-alone" MapML document. Such a document -would be loaded into an HTML document by the custom element, via a URL -reference in the src attribute: ``. +would be loaded into an HTML document by the custom element, via a URL +reference in the src attribute: ``. Another scenario that is conceptually supported is to have an (X)HTML document that -contains a element that contains one or more elements that +contains a element that contains one or more elements that in turn contain 'inline' MapML content, i.e. MapML vocabulary elements contained -within the begin and end tags. +within the begin and end tags. I couldn't get a version of an rnc schema for xhtml to work, so I have to be satisfied with validating a document that contains only a `` element, with the diff --git a/schema/mapml-document.xml b/schema/mapml-document.xml index 5a26196..378f28c 100644 --- a/schema/mapml-document.xml +++ b/schema/mapml-document.xml @@ -1,4 +1,4 @@ - + Canada Base Map - Geometry diff --git a/schema/mapml-viewer.rnc b/schema/mapml-viewer.rnc index 6fe31ce..9a03415 100644 --- a/schema/mapml-viewer.rnc +++ b/schema/mapml-viewer.rnc @@ -1,7 +1,7 @@ datatypes xsd = "http://www.w3.org/2001/XMLSchema-datatypes" default namespace = "http://www.w3.org/1999/xhtml" start = mapml-viewer -mapml-viewer = element mapml-viewer { layer-*, +mapml-viewer = element mapml-viewer { map-layer*, attribute lat {text}, attribute lon {text}, attribute zoom {text}, @@ -12,10 +12,10 @@ mapml-viewer = element mapml-viewer { layer-*, attribute width {text}?, attribute static {text}?, map-caption?, - layer-* + map-layer* } map-caption = element map-caption { text } -layer- = element layer- { +map-layer = element map-layer { attribute src { xsd:anyURI }?, attribute label {text}?, attribute checked {text}?, diff --git a/schema/mapml-viewer.sch b/schema/mapml-viewer.sch index 413fdc8..8b002f6 100644 --- a/schema/mapml-viewer.sch +++ b/schema/mapml-viewer.sch @@ -3,15 +3,15 @@ xmlns:sqf="http://www.schematron-quickfix.com/validator/process" xmlns:xs="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://www.w3.org/1999/xhtml"> - - The layer- element must be a child of the mapml-viewer element - The <layer-> element must have either a src attribute or inline content + + The map-layer element must be a child of the mapml-viewer element + The <map-layer> element must have either a src attribute or inline content - + In the case that a label attribute exists and a map-title element is present, the map-title will be preferred. - The layer- element MUST have a trailing hyphen: layer- + The map-layer element MUST have a trailing hyphen: map-layer diff --git a/schema/mapml-viewer.xhtml b/schema/mapml-viewer.xhtml index b43bdf5..ce5a68a 100644 --- a/schema/mapml-viewer.xhtml +++ b/schema/mapml-viewer.xhtml @@ -2,9 +2,9 @@ custom element that goes in the element of an HTML document --> A pleasing map of Canada - - - + + + @@ -55,5 +55,5 @@ custom element that goes in the element of an HTML document --> - + diff --git a/spec/examples/cbmt.mapml b/spec/examples/cbmt.mapml index e7c5074..6e381be 100644 --- a/spec/examples/cbmt.mapml +++ b/spec/examples/cbmt.mapml @@ -3,14 +3,14 @@ Canada Base Map - Transportation - + - + diff --git a/spec/examples/map-1.html b/spec/examples/map-1.html index 8129555..44ed77c 100644 --- a/spec/examples/map-1.html +++ b/spec/examples/map-1.html @@ -4,7 +4,7 @@ Authoring example 1 - + @@ -36,7 +36,7 @@ @@ -45,7 +45,7 @@ Paris, the City of Lights - + @@ -53,7 +53,7 @@ - + diff --git a/spec/examples/map-2.html b/spec/examples/map-2.html index 5ef5155..a898e5a 100644 --- a/spec/examples/map-2.html +++ b/spec/examples/map-2.html @@ -4,7 +4,7 @@ Authoring example 2 - + @@ -36,7 +36,7 @@ @@ -44,7 +44,7 @@ - + diff --git a/spec/index.html b/spec/index.html index ae0aa3b..47ce795 100644 --- a/spec/index.html +++ b/spec/index.html @@ -328,6 +328,7 @@

Changes

  • : Update Authoring section. Include definitions of local and remote content.
  • : Correct error in contexts in which extent is found. Add opacity attribute to layer. Update editors. Add WebIDL for layer opacity; Add or update extent attributes for label, checked, hidden, opacity and disabled. Update extent content model to add allowed metadata content for zoom and extent.
  • : Rename Web-Map-Custom-Element repo to MapML.js polyfill +
  • : Rename <layer-> custom element to <map-layer> @@ -1136,7 +1137,7 @@

    Remote content

                   <mapml-viewer projection="CBMTILE" zoom="15" lat="45.4215" lon="-75.6972" width="600" height="350" controls controlslist="geolocation">
                 <map-caption>A map of downtown Ottawa, Canada</map-caption>
-                <layer- label="Canada Base Map - Transportation (CBMT)" src="https://example.com/mapml/cbmt/" checked crossorigin></layer->
+                <map-layer label="Canada Base Map - Transportation (CBMT)" src="https://example.com/mapml/cbmt/" checked crossorigin></map-layer>
               </mapml-viewer>

    The document that is found at the src URL above has content MIME media type "text/mapml" and is as follows: