diff --git a/resources/tcrs.pptx b/resources/tcrs.pptx index 3b0747c..6c6f2b8 100644 Binary files a/resources/tcrs.pptx and b/resources/tcrs.pptx differ diff --git a/schema/mapml-document.xml b/schema/mapml-document.xml index 9ac2912..5a26196 100644 --- a/schema/mapml-document.xml +++ b/schema/mapml-document.xml @@ -10,10 +10,10 @@ title="Open Government Licence - Canada"/> + > - + @@ -21,7 +21,7 @@ max="56244"/> + > diff --git a/spec/examples/cbmt.mapml b/spec/examples/cbmt.mapml new file mode 100644 index 0000000..e7c5074 --- /dev/null +++ b/spec/examples/cbmt.mapml @@ -0,0 +1,17 @@ + + + Canada Base Map - Transportation + + + + + + + + + + + + + + \ No newline at end of file diff --git a/spec/examples/map-1.html b/spec/examples/map-1.html index a6433fe..8129555 100644 --- a/spec/examples/map-1.html +++ b/spec/examples/map-1.html @@ -47,11 +47,11 @@ Paris, the City of Lights - + - + diff --git a/spec/examples/map-2.html b/spec/examples/map-2.html index e325a55..5ef5155 100644 --- a/spec/examples/map-2.html +++ b/spec/examples/map-2.html @@ -44,7 +44,7 @@ - + diff --git a/spec/examples/mapml.png b/spec/examples/mapml.png index dcdf674..943e444 100644 Binary files a/spec/examples/mapml.png and b/spec/examples/mapml.png differ diff --git a/spec/index.html b/spec/index.html index 5666fc8..22a3343 100644 --- a/spec/index.html +++ b/spec/index.html @@ -22,21 +22,6 @@ { name: "Peter Rushforth", company: "Natural Resources Canada" - }, - { - name: "Robert Linder" - } - ], - authors: [ - { - name: "Peter Rushforth", - company: "Natural Resources Canada" - }, - { - name: "Robert Linder" - }, - { - name: "Joan Masó" } ], group: "maps4html", @@ -341,6 +326,7 @@

Changes

  • : Add initial draft WebIDL for geojson2mapml(). Add prose for back, forward, reload.
  • : Add HTMLGeometryChildElement abstract interface
  • : 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. @@ -479,7 +465,7 @@

    The <mapml-viewer>The <layer> element

    Global attributes.
    src — The URL of the layer resource.
    label — A label for the layer in the layer control, - if the layer is not not hidden. The map author's title element takes precedence over label, if available.
    + if the layer is not hidden. The map author's title element takes precedence over label, if available.
    checked — Turn the layer on/off dynamically on the map.
    hidden — Visibility status of the layer in the layer control. Does not affect visibility of the layer on the map.
    +
    opacity — An initial opacity value which is reflected to the exposed user interface in the layer control for opacity. Opacity values have a decimal range from 0 (transparent) to 1.0 (opaque)
    referrerpolicy — Referrer policy for fetches initiated by the element.
    crossorigin — A CORS settings attribute, specifies how the element handles crossorigin requests.
    Tag omission in text/html:
    @@ -921,6 +908,7 @@

    The <layer> element

    checked; readonly attribute boolean disabled; attribute boolean hidden; + attribute double opacity; attribute DOMString referrerPolicy; attribute DOMString? crossOrigin; undefined zoomTo(); @@ -935,7 +923,7 @@

    The <layer> element

    The mapml-viewer element displays its child layer elements similarly to (partially) transparent "acetate" layers on a (paper) map. The layers follow the painters model, whereby - layer elements are displayed on top of earlier siblings according to their document order. layer transparency is controlled by the CSS opacity property. [[SVG2]] [[css-color-3]]

    + layer elements are displayed on top of previous siblings according to their document order. layer transparency is controlled by the opacity attribute.

    In contrast to the HTML media elements' source child element where a single source element is selected by the user agent for play, the mapml-viewer element's child layer elements are @@ -1083,9 +1071,9 @@

    Local and remote content

    the layer src attribute. layer element content may be local or remote, but a layer - element may not have both local content and remote content; if a + element MUST NOT have both local content and remote content; if a layer element has both local content - and a src attribute, the (which one?) + and a src attribute (remote content), the local content will be ignored. In the element descriptions of this document, each contains a "Contexts in which this element can be used" section. The terms "local content" and "remote content" in that section is intended to describe the appropriate @@ -1120,11 +1108,11 @@

    Local content

    <map-caption>Paris, the City of Lights</map-caption> <layer checked> <map-link rel="license" href="https://www.openstreetmap.org/copyright" title="© OpenStreetMap contributors CC BY-SA"/> - <map-extent units="OSMTILE" > + <map-extent units="OSMTILE" checked> <map-input name="z" type="zoom" value="18" min="0" max="18"></map-input> <map-input name="x" type="location" units="tilematrix" axis="column"></map-input> <map-input name="y" type="location" units="tilematrix" axis="row"></map-input> - <map-link rel="tile" tref="https://tile.openstreetmap.org/{z}/{x}/{y}.png" /> + <map-link rel="tile" tref="https://tile.openstreetmap.org/{z}/{x}/{y}.png" ></map-link> </map-extent> </layer> </mapml-viewer> @@ -1147,7 +1135,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>
+                <layer- label="Canada Base Map - Transportation (CBMT)" src="https://example.com/mapml/cbmt/" checked crossorigin></layer->
               </mapml-viewer>

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

    @@ -1160,7 +1148,7 @@

    Remote content

    <map-link rel="license" href="https://www.nrcan.gc.ca/earth-sciences/geography/topographic-information/free-data-geogratis/licence/17285" title="Canada Base Map © Natural Resources Canada"></map-link> </map-head> <map-body> - <map-extent units="CBMTILE"> + <map-extent units="CBMTILE" checked="checked"> <map-input name="z" type="zoom" value="17" min="0" max="17"></map-input> <map-input name="y" type="location" units="tilematrix" axis="row"></map-input> <map-input name="x" type="location" units="tilematrix" axis="column"></map-input> @@ -1856,14 +1844,14 @@
    The <meta> element
    Categories:
    Metadata content.
    Contexts in which this element can be used:
    -
    In remote content, as a child element of the head element.
    -
    In local content, as a child of the layer element.
    +
    In remote content, as a child element of the head or extent elements.
    +
    In local content, as a child of the layer or extent elements.
    Content model:
    Nothing.
    Content attributes:
    -
    name — Metadata name.
    -
    http-equiv — Pragma directive.
    -
    content — Value of the element.
    +
    name — Metadata name.
    +
    http-equiv — Pragma directive.
    +
    content — Value of the element.
    Accessibility considerations:
    @@ -2155,19 +2143,20 @@
    The <extent> elementCategories:
    Metadata content.
    Contexts in which this element can be used:
    -
    In remote content, as a child of the head element.
    +
    In remote content, as a child of the body element.
    In local content, as a child of the layer element.
    Content model:
    A set of multiple input and one or more link elements with their rel attribute in either the "tile", "image" or "features" state, and zero or one - link element with its rel attribute in the "query" state. + link element with its rel attribute in the "query" state. Optional metadata content describing server-side extent content, in the form of zero or more meta elements with name attribute in the zoom or extent state.
    Content attributes:
    -
    units — The name of the coordinate reference system whose measurement units are to be used by values supplied by child input elements.
    -
    label — A text label to be applied to the user interface for the extent in the layer control. If no label is supplied, the extent will not expose a user interface in the layer control, but will still be displayed on the map.
    -
    opacity — An initial opacity value, that will be applied to the content retrieved by the extent, and which is reflected to the exposed user interface for opacity. Opacity values have a decimal range from 0 (transparent) to 1.0 (opaque).
    -
    checked — A boolean attribute that sets the initial state of the exposed user interface in the layer control. If checked, the extent content is displayed on the map.
    +
    units — The name of the coordinate reference system whose measurement units are to be used by values supplied by child input elements.
    +
    label — A text label to be applied to the user interface for the extent in the layer control. If no label content attribute is supplied, a default internationalized string value will be generated and rendered for non-hidden extents.
    +
    opacity — An initial opacity value, that will be applied to the content retrieved by the extent, and which is reflected to the exposed layer control user interface for opacity. Opacity values have a decimal range from 0 (transparent) to 1.0 (opaque).
    +
    checked — A boolean attribute that sets the state of the exposed user interface in the layer control. If the attribute is present, the extent content is rendered on the map; if the checked attribute is not present, the extent may be represented in the layer control, but its content will not be rendered.
    +
    hidden — Visibility status of the extent in the layer control. Does not affect visibility of the extent on the map.
    Accessibility considerations:
    @@ -2208,18 +2197,27 @@
    The <extent> elementunits; + attribute DOMString label; + attribute boolean checked; + readonly attribute boolean disabled; + attribute boolean hidden; + attribute double opacity; };

    - The extent element is a map-associated affordance, which contains input and link elements, whose job it is to serialize location event properties that can be submitted to a server for processing. + The extent element is a map-associated affordance, which contains input and link elements, whose job it is to serialize location event properties that can be submitted to a server for processing. Returned content is rendered on the map in the DOM sequence order of the extent child element among its siblings in the parent element. The extent's content rendered transparency is controlled by the opacity attribute.

    The units attribute indicates the parent TCRS that location events shall be generated for, and serialized as requested by the extent's contents.

    + +

    The label IDL attribute reflects the content attribute, if present. If no content attribute is present, the IDL attribute returns an internationalized string for 'Sub-layer'.

    + +

    The display state (on / off) of the content represented by the extent element is controlled by the checked boolean attribute. If checked is true, the extent is rendered on the map; if not checked the extent is not rendered but should remain visible in the mapml-viewer element's representation of controls, in an un-checked state.

    + +

    The hidden boolean attribute can be set to remove the extent from the map layer control, but it will remain displayed on the map. In order to remove the extent content from the map, it can have its checked property toggled, or the element can be removed from the DOM.

    + +

    The disabled IDL attribute is a read-only boolean representation of the visibility of the extent contents on the map. If the extent is not visible due to errors, including projection, zoom or bounds mismatch, the disabled IDL attribute will return true. If the extent is present in the layer control (i.e. hidden is false), its checked state will be disabled until the error condition is corrected, for example by zooming to the extent's bounds.

    @@ -3464,5 +3462,9 @@

    RelaxNG Schema

    +
    +

    Contributors

    + Thanks to all our contributors: Robert Linder, Joan Masó and elf Pavlik +