Skip to content

Commit 9e66253

Browse files
committed
Add text-valued <title> element child of <feature> per Maps4HTML/MapML.js#316.
Change mapml vocabulary to the xhtml namespace.
1 parent a09c9cd commit 9e66253

File tree

3 files changed

+12
-13
lines changed

3 files changed

+12
-13
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# MapML [![Join the chat at https://gitter.im/Maps4HTML/MapML](https://badges.gitter.im/Maps4HTML/MapML.svg)](https://gitter.im/Maps4HTML/MapML?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
22

3-
[Map Markup Language](https://maps4html.org/MapML/spec/) is hypertext for Web maps, like HTML is hypertext for Web pages. See the [MapML proposal](https://github.com/Maps4HTML/MapML-Proposal).
3+
[Map Markup Language](http://maps4html.github.io/MapML/spec/) is hypertext for Web maps, like HTML is hypertext for Web pages
44

55
## Background
66

@@ -10,4 +10,4 @@ MapML aims to be a simple format which strictly relies on existing Web standards
1010

1111
## Maps4HTML Community Group
1212

13-
MapML is being developed by the W3C [Maps For HTML Community Group](https://www.w3.org/community/maps4html/). Membership in that group is encouraged, however you do not have to join to use the information found here. However, if you wish to contribute, please join the Maps For HTML Community Group, and help us make the Web a map-friendly platform for everyone, everywhere!
13+
MapML is being developed by the W3C [Maps For HTML Community Group](http://www.w3.org/community/maps4html/). Membership in that group is encouraged, however you do not have to join to use the information found here. However, if you wish to contribute, please join the Maps For HTML Community Group, and help us make the Web a map-friendly platform for everyone, everywhere!

schema/README.md

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,22 @@
11
# MapML
22

3-
[Map Markup Language](http://maps4html.github.io/MapML/spec/) is 'MicroXML' vocabulary for maps.
3+
[Map Markup Language](https://maps4html.org/MapML/spec/) is a proposed HTML vocabulary for maps.
44
Although document validity is not a concept that can be strictly enforced on the internet,
55
the documents in this directory are an attempt to provide guidance to map authors on what
66
constitutes markup that is understood as being within scope of the MapML specification.
77

8-
In principle, a MapML document should be parseable with an HTML-like parser, because
9-
many of the elements are copied from the HTML vocabulary and are intended to have
10-
identical processing semantics to their counterpart in HTML.
8+
In principle, a MapML document should be parseable the HTML parser, because
9+
many of the elements are extended from the HTML namespace and are intended to have
10+
identical processing semantics to their counterpart in HTML apart from extensions specified in MapML.
1111

12-
In practice, no such MapML parser exists at the time of writing, and it should be good enough to encode
13-
a MapML document in [MicroXML](https://dvcs.w3.org/hg/microxml/raw-file/tip/spec/microxml.html) syntax so that an XML parser can be used. When such a parser is used,
12+
In practice, no such MapML/HTML parser exists at the time of writing, and it should be good enough to encode
13+
a MapML document in HTML5 XML syntax so that Web browsers' XML parsers can be used. When such a parser is used,
1414
it should be possible to use the schema / schematron documents in this directory to validate certain
1515
rules of MapML documents. The schemas / schematron files in this directory are intended to
16-
evolve as the concept of MapML evolves, and perhaps at some point when enough people
17-
get involved we will be able to 'fork' the nu validator / parser for HTML to provide a similarly
18-
robust parsing and validation service online.
16+
evolve as the concept of MapML evolves.
1917

2018
## Instructions
2119

22-
The files microxml.sch (a single [schematron](http://schematron.com/) validation rule for MicroXML syntax),
2320
mapml.rnc (a [RelaxNG](http://www.relaxng.org/compact-tutorial-20030326.html) compact syntax schema) and mapml.sch (post-schema validation MapML
2421
schematron rules) are intended to be applied in that order.
2522

schema/mapml.rnc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
datatypes xsd = "http://www.w3.org/2001/XMLSchema-datatypes"
2+
default namespace = "https://www.w3.org/1999/xhtml/"
23
start = mapml
34
mapml = element mapml { head?, attribute lang {text}?, body }
45
head = element head { headContent }
@@ -78,7 +79,7 @@ feature = element feature {
7879
attribute id { text }?,
7980
attribute class { text }?,
8081
attribute zoom { text }?,
81-
(geometry? & properties?)
82+
(geometry? & properties? & title?)
8283
}
8384
tile = element tile {
8485
attribute col { xsd:integer },
@@ -89,6 +90,7 @@ bbox = element bbox { twoPositions }
8990
image = element image { ImageModel }
9091
geometry = element geometry { GeometryContent }
9192
properties = element properties { PropertyContent }
93+
title = element title { text? }
9294

9395
ImageResourceMetadataAttributes =
9496
attribute src { text },

0 commit comments

Comments
 (0)