From bf58ae296b724374706ab310eed891994255c382 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20T=C5=AFma?= <tumic@cbox.cz>
Date: Wed, 10 Oct 2018 23:09:00 +0200
Subject: [PATCH] XSD fix + description HTML updates/markup fixes.

---
 map/1.0            |  1 -
 map/1.0/index.html | 21 ++++++++++
 map/1.0/map.xsd    | 99 ++++++++++++++++++++++++++++++++++++++++++++++
 map/1.1/index.html |  7 +++-
 map/1.2/index.html |  7 +++-
 map/1/index.html   | 13 +++++-
 map/1/map.xsd      |  4 +-
 7 files changed, 146 insertions(+), 6 deletions(-)
 delete mode 120000 map/1.0
 create mode 100644 map/1.0/index.html
 create mode 100644 map/1.0/map.xsd
diff --git a/map/1.0 b/map/1.0
deleted file mode 120000
index 56a6051c..00000000
--- a/map/1.0
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file
diff --git a/map/1.0/index.html b/map/1.0/index.html
new file mode 100644
index 00000000..56dab939
--- /dev/null
+++ b/map/1.0/index.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<title>Map version 1.0 XML file format</title>
+<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
+<style>
+body {
+	max-width: 50em;
+}
+</style>
+</head>
+<body>
+
+<h1>Map version 1.0 XML file format</h1>
+<p>For human-readable Map format description, see the
+<a href="http://www.gpxsee.org/doc#online">GPXSee documentation page</a>, for
+XML validation use the <a href="http://www.gpxsee.org/map/1.0/map.xsd">XSD
+file</a>.</p>
+
+</body>
+</html>
diff --git a/map/1.0/map.xsd b/map/1.0/map.xsd
new file mode 100644
index 00000000..2cb65337
--- /dev/null
+++ b/map/1.0/map.xsd
@@ -0,0 +1,99 @@
+<?xml version="1.0"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+  targetNamespace="http://www.gpxsee.org/map/1.0"
+  xmlns="http://www.gpxsee.org/map/1.0"
+  elementFormDefault="qualified">
+
+	<xs:simpleType name="mapType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="OSM"/>
+			<xs:enumeration value="WMTS"/>
+			<xs:enumeration value="WMS"/>
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name="urlType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="REST"/>
+			<xs:enumeration value="KVP"/>
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name="axisOrder">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="xy"/>
+			<xs:enumeration value="yx"/>
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:element name="map">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="name" type="xs:string" minOccurs="1" maxOccurs="1"/>
+				<xs:element name="url" minOccurs="1" maxOccurs="1">
+					<xs:complexType mixed="true">
+						<xs:simpleContent>
+							<xs:extension base="xs:string">
+								<xs:attribute name="type" type="urlType"/>
+							</xs:extension>
+						</xs:simpleContent>
+					</xs:complexType>
+				</xs:element>
+				<xs:element name="copyright" type="xs:string" minOccurs="0" maxOccurs="1"/>
+				<xs:element name="zoom" minOccurs="0" maxOccurs="1">
+					<xs:complexType>
+						<xs:attribute name="min" type="xs:nonNegativeInteger"/>
+						<xs:attribute name="max" type="xs:nonNegativeInteger"/>
+					</xs:complexType>
+				</xs:element>
+				<xs:element name="bounds" minOccurs="0" maxOccurs="1">
+					<xs:complexType>
+						<xs:attribute name="top" type="xs:decimal"/>
+						<xs:attribute name="bottom" type="xs:decimal"/>
+						<xs:attribute name="left" type="xs:decimal"/>
+						<xs:attribute name="right" type="xs:decimal"/>
+					</xs:complexType>
+				</xs:element>
+				<xs:element name="format" type="xs:string" minOccurs="0" maxOccurs="1"/>
+				<xs:element name="layer" type="xs:string" minOccurs="0" maxOccurs="1"/>
+				<xs:element name="style" type="xs:string" minOccurs="0" maxOccurs="1"/>
+				<xs:element name="crs" minOccurs="0" maxOccurs="1">
+					<xs:complexType mixed="true">
+						<xs:simpleContent>
+							<xs:extension base="xs:string">
+								<xs:attribute name="axis" type="axisOrder"/>
+							</xs:extension>
+						</xs:simpleContent>
+					</xs:complexType>
+				</xs:element>
+				<xs:element name="set" minOccurs="0" maxOccurs="1">
+					<xs:complexType mixed="true">
+						<xs:simpleContent>
+							<xs:extension base="xs:string">
+								<xs:attribute name="axis" type="axisOrder"/>
+							</xs:extension>
+						</xs:simpleContent>
+					</xs:complexType>
+				</xs:element>
+				<xs:element name="dimension" minOccurs="0" maxOccurs="unbounded">
+					<xs:complexType mixed="true">
+						<xs:simpleContent>
+							<xs:extension base="xs:string">
+								<xs:attribute name="id" type="xs:string" use="required"/>
+							</xs:extension>
+						</xs:simpleContent>
+					</xs:complexType>
+				</xs:element>
+				<xs:element name="authorization" minOccurs="0" maxOccurs="1">
+					<xs:complexType>
+						<xs:attribute name="username" type="xs:string" use="required"/>
+						<xs:attribute name="password" type="xs:string" use="required"/>
+					</xs:complexType>
+				</xs:element>
+			</xs:sequence>
+
+			<xs:attribute name="type" type="mapType" use="optional"/>
+		</xs:complexType>
+	</xs:element>
+
+</xs:schema> 
diff --git a/map/1.1/index.html b/map/1.1/index.html
index e86a5dc2..0947b11d 100644
--- a/map/1.1/index.html
+++ b/map/1.1/index.html
@@ -3,6 +3,11 @@
 <head>
 <title>Map version 1.1 XML file format</title>
 <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
+<style>
+body {
+	max-width: 50em;
+}
+</style>
 </head>
 <body>
 
@@ -10,7 +15,7 @@
 <p>For human-readable Map format description, see the
 <a href="http://www.gpxsee.org/doc#online">GPXSee documentation page</a>, for
 XML validation use the <a href="http://www.gpxsee.org/map/1.1/map.xsd">XSD
-file</a>.
+file</a>.</p>
 
 <p>Changes since 1.0:</p>
 <ul>
diff --git a/map/1.2/index.html b/map/1.2/index.html
index d7774760..d3a3571f 100644
--- a/map/1.2/index.html
+++ b/map/1.2/index.html
@@ -3,6 +3,11 @@
 <head>
 <title>Map version 1.2 XML file format</title>
 <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
+<style>
+body {
+	max-width: 50em;
+}
+</style>
 </head>
 <body>
 
@@ -10,7 +15,7 @@
 <p>For human-readable Map format description, see the
 <a href="http://www.gpxsee.org/doc#online">GPXSee documentation page</a>, for
 XML validation use the <a href="http://www.gpxsee.org/map/1.2/map.xsd">XSD
-file</a>.
+file</a>.</p>
 
 <p>Changes since 1.1:</p>
 <ul>
diff --git a/map/1/index.html b/map/1/index.html
index 362a23ca..a7860216 100644
--- a/map/1/index.html
+++ b/map/1/index.html
@@ -3,6 +3,11 @@
 <head>
 <title>Map version 1.0 XML file format</title>
 <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
+<style>
+body {
+	max-width: 50em;
+}
+</style>
 </head>
 <body>
 
@@ -10,7 +15,13 @@
 <p>For human-readable Map format description, see the
 <a href="http://www.gpxsee.org/doc#online">GPXSee documentation page</a>, for
 XML validation use the <a href="http://www.gpxsee.org/map/1/map.xsd">XSD
-file</a>.
+file</a><sup>1</sup>.</p>
+
+<p><i>1. Two XSDs exist for the 1.0 file format. They are content-identical and
+differ only in the xmlns URI. This file refers the obsolete
+<code>http://www.gpxsee.org/map/1</code> xmlns. Use the replacing
+<code>http://www.gpxsee.org/map/1.0</code> xmlns with the corresponding
+<a href="http://www.gpxsee.org/map/1.0/map.xsd">XSD</a> wherever possible.<i></p>
 
 </body>
 </html>
diff --git a/map/1/map.xsd b/map/1/map.xsd
index 2cb65337..b5dcf55b 100644
--- a/map/1/map.xsd
+++ b/map/1/map.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  targetNamespace="http://www.gpxsee.org/map/1.0"
-  xmlns="http://www.gpxsee.org/map/1.0"
+  targetNamespace="http://www.gpxsee.org/map/1"
+  xmlns="http://www.gpxsee.org/map/1"
   elementFormDefault="qualified">
 
 	<xs:simpleType name="mapType">
