Merge pull request #157 from marqh/preRC3-#156v2

adopt changes from #156
wmo-im · May 1, 2019 · f5b464e · f5b464e
2 parents e794d47 + 3184b92
commit f5b464e
Show file tree

Hide file tree

Showing 28 changed files with 427 additions and 412 deletions.
diff --git a/IWXXM/ReleaseNotes-IWXXM.txt b/IWXXM/ReleaseNotes-IWXXM.txt
diff --git a/IWXXM/TAC-to-XML-Guidance.txt b/IWXXM/TAC-to-XML-Guidance.txt
@@ -8,6 +8,8 @@ All reports
 ==========================
 The attribute "reportStatus" of a report shall be set to either "NORMAL", "AMENDMENT" or "CORRECTION" to reflect its status.  Note that some of the statuses do not apply in certain reports.
 
+A Coordinate Reference System (CRS) shall be specified in geometries defined in all reports and is constrained to 2 dimensional horizontal CRS.  Attribute srsName shall be defined accordingly with srsDimension set to "2" and non-empty axisLabels set approprately with the CRS used.
+
 ==========================
 METAR/SPECI
 ==========================
@@ -72,13 +74,13 @@ Runway depth of deposit "99" (value from WMO code table 1079)
   When the runway depth of deposits is not reported due to runway or runways non-operational due to snow, slush, ice, large drifts or runway clearance this shall be indicated by a "depthOfDeposits" with a nilReason of "http://codes.wmo.int/common/nil/unknown"
 
 Trend forecast BECMG without a specified time (TL, AT, FM)
-  When a trend forecast is reported with a BECMG block without a specified time and the period commences at the beginning of the trend forecast period and ceases by the end of the trend forecast period this should be represented as a phenomenonTime with a nilReason of "http://codes.wmo.int/common/nil/missing".  Otherwise if the BECMG time is uncertain within the trend forecast period this should be represented as a phenomenonTime with a nilReason of "http://codes.wmo.int/common/nil/unknown"
+  When a trend forecast is reported with a BECMG block without a specified time and the period commences at the beginning of the trend forecast period and ceases by the end of the trend forecast period this shall be represented as a phenomenonTime with a nilReason of "http://codes.wmo.int/common/nil/missing".  Otherwise if the BECMG time is uncertain within the trend forecast period this shall be represented as a phenomenonTime with a nilReason of "http://codes.wmo.int/common/nil/unknown"
 
 Trend forecast TEMPO without a specified time (TL, AT, FM)
-  When a trend forecast is reported with a TEMPO block without a specified time and the period commences at the beginning of the trend forecast period and ceases by the end of the trend forecast period this should be represented as a phenomenonTime with a nilReason of "http://codes.wmo.int/common/nil/missing"
+  When a trend forecast is reported with a TEMPO block without a specified time and the period commences at the beginning of the trend forecast period and ceases by the end of the trend forecast period this shall be represented as a phenomenonTime with a nilReason of "http://codes.wmo.int/common/nil/missing"
 
 Observed quantities with a nilReason
-  When observed measures or quantities (such as air temperature or prevailing visibility) can not be reported due to sensor failures, the XML element should have xsi:nil set to "true", the uom set to "N/A", and the nilReason set to "http://codes.wmo.int/common/nil/notObservable"
+  When observed measures or quantities (such as air temperature or prevailing visibility) can not be reported due to sensor failures, the XML element shall have xsi:nil set to "true", the uom set to "N/A", and the nilReason set to "http://codes.wmo.int/common/nil/notObservable"
 
 Variations from mean wind direction
   In TAC the observed two extreme directions between which the wind has varied shall be given for dndndnVdxdxdx in clockwise order.  Care should be taken that "extremeClockwiseWindDirection" refers to the extreme clockwise direction from the wind which should be dxdxdx in the TAC report.  Similarly the corresponding part for "extremeCounterClockwiseWindDirection" is dndndn.
@@ -149,6 +151,12 @@ Volcanic Ash Advisory
 'NIL' aviation colour code
   A NIL aviation colour code shall be indicated with a "colourCode" with a nilReason of "http://codes.wmo.int/common/nil/missing"
 
+'UNKNOWN' eruption details
+  An unknown eruption details shall be indicated with a "eruptionDetails" with a nilReason of "http://codes.wmo.int/common/nil/unknown"
+
+Eruption details
+  Date/time of eruption(s) shall be included in "volcano" and the rest in "eruptionDetails"
+
 'VA NOT IDENTIFIABLE FM SATELLITE DATA'
   Element "status" under "VolcanicAshObservedOrEstimatedConditions" shall be set to "NOT_IDENTIFIABLE" to reflect this sitution.  Set it to "IDENTIFIABLE" otherwise
 

diff --git a/IWXXM/airmet.xsd b/IWXXM/airmet.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schema elementFormDefault="qualified" targetNamespace="http://icao.int/iwxxm/3.0" version="3.0.0RC3" xmlns:iwxxm="http://icao.int/iwxxm/3.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:aixm="http://www.aixm.aero/schema/5.1.1" xmlns="http://www.w3.org/2001/XMLSchema">
 	<include schemaLocation="common.xsd"></include>
-	<import namespace="http://www.aixm.aero/schema/5.1.1" schemaLocation="http://www.aixm.aero/schema/5.1.1_profiles/AIXM_WX/5.1.1a/AIXM_Features.xsd"></import>
+	<import namespace="http://www.aixm.aero/schema/5.1.1" schemaLocation="http://www.aixm.aero/schema/5.1.1_profiles/AIXM_WX/5.1.1b/AIXM_Features.xsd"></import>
 	<import namespace="http://www.opengis.net/gml/3.2" schemaLocation="http://schemas.opengis.net/gml/3.2.1/gml.xsd"></import>
 	<annotation>
 		<documentation>AIRMET reporting constructs as defined in ICAO Annex 3 / WMO No. 49-2.

diff --git a/IWXXM/common.xsd b/IWXXM/common.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schema elementFormDefault="qualified" targetNamespace="http://icao.int/iwxxm/3.0" version="3.0.0RC3" xmlns:iwxxm="http://icao.int/iwxxm/3.0" xmlns:aixm="http://www.aixm.aero/schema/5.1.1" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema">
-	<import namespace="http://www.aixm.aero/schema/5.1.1" schemaLocation="http://www.aixm.aero/schema/5.1.1/AIXM_Features.xsd"></import>
+	<import namespace="http://www.aixm.aero/schema/5.1.1" schemaLocation="http://aixm.aero/schema/5.1.1/AIXM_Features.xsd"></import>
 	<import namespace="http://www.opengis.net/gml/3.2" schemaLocation="http://schemas.opengis.net/gml/3.2.1/gml.xsd"></import>
 	<annotation>
 		<documentation>Common constructs used across multiple packages.  This package includes constructs closely related to the aviation weather domain.

diff --git a/IWXXM/examples/airmet-A6-1a-TS.xml b/IWXXM/examples/airmet-A6-1a-TS.xml
@@ -60,7 +60,7 @@
                           <aixm:type>FIR</aixm:type>
                           <aixm:designator>YUCC</aixm:designator>
                           <aixm:name>AMSWELL FIR</aixm:name>
-                        <!-- FIR boundary can be reported in an aixm:geometryComponent -->
+                          <!-- FIR boundary can be reported in an aixm:geometryComponent -->
                     </aixm:AirspaceTimeSlice>
               </aixm:timeSlice>
         </aixm:Airspace>
@@ -90,7 +90,7 @@
 	                    <aixm:upperLimitReference>STD</aixm:upperLimitReference>
 	                    <aixm:maximumLimit xsi:nil="true" nilReason="unknown"/>
                             <aixm:horizontalProjection>
-                                <aixm:Surface gml:id="uuid.626c2d10-d5ba-427e-a0c8-98949dd20a69" srsName="http://www.opengis.net/def/crs/EPSG/0/4326">
+                                <aixm:Surface gml:id="uuid.626c2d10-d5ba-427e-a0c8-98949dd20a69" srsDimension="2" axisLabels="Lat Long" srsName="http://www.opengis.net/def/crs/EPSG/0/4326">
                                     <gml:polygonPatches>
                                         <gml:PolygonPatch>
                                             <gml:exterior>

diff --git a/IWXXM/examples/airmet-translation-failed.xml b/IWXXM/examples/airmet-translation-failed.xml
@@ -3,7 +3,7 @@
     An example of a AIRMET which failed translation.  This is an example modified from ICAO Annex 3 Example A6-1
     where 'ISOL TS' from the original example was changed to 'INVALID TS', which is an invalid AIRMET:
 
-    YUDD AIRMET 1 VALID 151520/151800 YUSO–
+    YUDD AIRMET 1 VALID 151520/151800 YUSO-
     YUDD SHANLON FIR INVALID TS
     OBS N OF S50 TOP ABV FL100 STNR WKN
 -->

diff --git a/IWXXM/examples/metar-A3-1.xml b/IWXXM/examples/metar-A3-1.xml
@@ -27,20 +27,22 @@
     <!-- The aerodrome at which this observation took place -->
     <iwxxm:aerodrome>
         <aixm:AirportHeliport gml:id="uuid.143d63d9-15f5-442e-9bdc-1f3db93fb619">
-          <aixm:timeSlice>
-            <aixm:AirportHeliportTimeSlice gml:id="uuid.75c3340c-3679-4e31-8aec-efdabe375d49">
-              <gml:validTime/>
-              <aixm:interpretation>SNAPSHOT</aixm:interpretation>
-              <aixm:designator>YUDO</aixm:designator>
-              <aixm:name>DONLON/INTERNATIONAL</aixm:name>
-              <aixm:locationIndicatorICAO>YUDO</aixm:locationIndicatorICAO>
-              <aixm:ARP>
-                <aixm:ElevatedPoint gml:id="uuid.dd2c810b-edaa-4ad9-bb65-9ab774d1522e" srsDimension="2" srsName="http://www.opengis.net/def/crs/EPSG/0/4326">
-                    <gml:pos>12.34 -12.34</gml:pos>
-                </aixm:ElevatedPoint>
-              </aixm:ARP>
-            </aixm:AirportHeliportTimeSlice>
-          </aixm:timeSlice>
+            <aixm:timeSlice>
+                <aixm:AirportHeliportTimeSlice gml:id="uuid.75c3340c-3679-4e31-8aec-efdabe375d49">
+                    <gml:validTime/>
+                    <aixm:interpretation>SNAPSHOT</aixm:interpretation>
+                    <aixm:designator>YUDO</aixm:designator>
+                    <aixm:name>DONLON/INTERNATIONAL</aixm:name>
+                    <aixm:locationIndicatorICAO>YUDO</aixm:locationIndicatorICAO>
+                    <aixm:ARP>
+                        <aixm:ElevatedPoint gml:id="uuid.dd2c810b-edaa-4ad9-bb65-9ab774d1522e" srsDimension="2" axisLabels="Lat Long" srsName="http://www.opengis.net/def/crs/EPSG/0/4326">
+                            <gml:pos>12.34 -12.34</gml:pos>
+                            <aixm:elevation uom="M">12</aixm:elevation>
+                            <aixm:verticalDatum>EGM_96</aixm:verticalDatum>
+                        </aixm:ElevatedPoint>
+                    </aixm:ARP>
+                </aixm:AirportHeliportTimeSlice>
+            </aixm:timeSlice>
         </aixm:AirportHeliport>
     </iwxxm:aerodrome>
 

diff --git a/IWXXM/examples/metar-EDDF-runwaystate.xml b/IWXXM/examples/metar-EDDF-runwaystate.xml
@@ -34,9 +34,11 @@
                     <aixm:name>FRANKFURT AM MAIN INTERNATIONAL</aixm:name>
                     <aixm:locationIndicatorICAO>EDDF</aixm:locationIndicatorICAO>
                     <aixm:ARP>
-                        <aixm:ElevatedPoint gml:id="uuid.68f896c8-6889-4b5b-8d79-1f1216ceb72f" srsDimension="3" srsName="http://www.opengis.net/def/crs/EPSG/0/4979">
-                            <gml:pos>50.0464 8.5986 112</gml:pos>
-                        </aixm:ElevatedPoint>
+                        <aixm:ElevatedPoint gml:id="uuid.68f196c8-6889-4b5b-8d79-1f1216ceb72f" srsDimension="2" axisLabels="Lat Long" srsName="http://www.opengis.net/def/crs/EPSG/0/4326">
+			    <gml:pos>50.0464 8.5986</gml:pos>
+                            <aixm:elevation uom="M">110</aixm:elevation>
+                            <aixm:verticalDatum>EGM_96</aixm:verticalDatum>
+			</aixm:ElevatedPoint>
                     </aixm:ARP>
                 </aixm:AirportHeliportTimeSlice>
             </aixm:timeSlice>

diff --git a/IWXXM/examples/metar-LKKV.xml b/IWXXM/examples/metar-LKKV.xml
@@ -50,7 +50,7 @@
             </iwxxm:surfaceWind>
 	        <iwxxm:presentWeather xlink:href="http://codes.wmo.int/306/4678/VCSH"/>
             <iwxxm:recentWeather xlink:href="http://codes.wmo.int/306/4678/TS"/>
-	        <!-- WS R18C -->
+            <!-- WS R18C -->
             <iwxxm:windShear>
                 <iwxxm:AerodromeWindShear>
                     <iwxxm:runway>
@@ -66,7 +66,7 @@
                     </iwxxm:runway>
                 </iwxxm:AerodromeWindShear>
             </iwxxm:windShear>
-	        <iwxxm:runwayState>
+            <iwxxm:runwayState>
                 <iwxxm:AerodromeRunwayState>
                     <iwxxm:runway>
                       <aixm:RunwayDirection gml:id="uuid.4ce3040f-69a1-4703-8a21-78a33c14ddce">

diff --git a/IWXXM/examples/sigmet-A6-1a-TS.xml b/IWXXM/examples/sigmet-A6-1a-TS.xml
@@ -2,7 +2,7 @@
 <!--
     An example of a SIGMET.  Original SIGMET from ICAO Annex 3 Example A6-1a:
     
-      YUDD SIGMET 2 VALID 101200/101600 YUSO –
+      YUDD SIGMET 2 VALID 101200/101600 YUSO-
       YUDD SHANLON FIR/UIR OBSC TS FCST S OF N54 AND E OF W012 TOP FL390 MOV E 20KT WKN
 -->
 <iwxxm:SIGMET 
@@ -60,7 +60,7 @@
                     <aixm:interpretation>SNAPSHOT</aixm:interpretation>
                     <aixm:type>OTHER:FIR_UIR</aixm:type>
                     <aixm:designator>YUDD</aixm:designator>
-                    <aixm:name>SHANLON FIR/UIR</aixm:name>
+		    <aixm:name>SHANLON FIR/UIR</aixm:name>
                     <!-- FIR boundary can be reported in an aixm:geometryComponent -->
                 </aixm:AirspaceTimeSlice>
             </aixm:timeSlice>
@@ -93,7 +93,7 @@
                             <aixm:upperLimit uom="FL">390</aixm:upperLimit>
                             <aixm:upperLimitReference>STD</aixm:upperLimitReference>
                             <aixm:horizontalProjection>
-                                <aixm:Surface gml:id="uuid.e20caa4b-2b93-4d28-9b14-e04196314999" uomLabels="deg deg" axisLabels="Lat Lon" srsDimension="2" srsName="http://www.opengis.net/def/crs/EPSG/0/4326">
+                                <aixm:Surface gml:id="uuid.e20caa4b-2b93-4d28-9b14-e04196314999" srsDimension="2" axisLabels="Lat Long" srsName="http://www.opengis.net/def/crs/EPSG/0/4326">
                                     <gml:polygonPatches>
                                         <gml:PolygonPatch>
                                             <gml:exterior>

diff --git a/IWXXM/examples/sigmet-A6-1b-CNL.xml b/IWXXM/examples/sigmet-A6-1b-CNL.xml
@@ -2,7 +2,7 @@
 <!--
     An example of a SIGMET.  Original SIGMET from ICAO Annex 3 Example A6-1b:
 
-      YUDD SIGMET 3 VALID 101345/101600 YUSO
+      YUDD SIGMET 3 VALID 101345/101600 YUSO-
       YUDD SHANLON FIR/UIR CNL SIGMET 2 101200/101600
 -->
 <iwxxm:SIGMET 

diff --git a/IWXXM/examples/sigmet-A6-2-TC.xml b/IWXXM/examples/sigmet-A6-2-TC.xml
@@ -2,7 +2,7 @@
 <!--
     An example of a SIGMET.  Original SIGMET from ICAO Annex 3 Example A6-2:
 
-      YUCC SIGMET 3 VALID 251600/252200 YUDO -
+      YUCC SIGMET 3 VALID 251600/252200 YUDO-
       YUCC AMSWELL FIR TC GLORIA PSN N2706 W07306 CB OBS AT 1600Z WI 250NM OF TC CENTRE TOP FL500 NC
       FCST AT 2200Z TC CENTRE PSN N2740 W07345
 -->
@@ -100,7 +100,7 @@
                             <aixm:upperLimit uom="FL">500</aixm:upperLimit>
                             <aixm:upperLimitReference>STD</aixm:upperLimitReference>
                             <aixm:horizontalProjection>
-                                <aixm:Surface gml:id="uuid.62695824-f234-4618-b459-90bb795cde9a" srsName="http://www.opengis.net/def/crs/EPSG/0/4326">
+                                <aixm:Surface gml:id="uuid.62695824-f234-4618-b459-90bb795cde9a" srsDimension="2" axisLabels="Lat Long" srsName="http://www.opengis.net/def/crs/EPSG/0/4326">
                                     <gml:polygonPatches>
                                         <gml:PolygonPatch>
                                             <gml:exterior>
@@ -126,7 +126,7 @@
                 </iwxxm:SIGMETEvolvingCondition>
             </iwxxm:member>
             <iwxxm:tropicalCyclonePosition>
-                <gml:Point gml:id="uuid.e84be2a6-cb1e-4905-b70a-6958c3cea1e3">
+                <gml:Point gml:id="uuid.e84be2a6-cb1e-4905-b70a-6958c3cea1e3" srsDimension="2" axisLabels="Lat Long" srsName="http://www.opengis.net/def/crs/EPSG/0/4326">
                     <gml:pos>27.10 -73.10</gml:pos>
                 </gml:Point>
             </iwxxm:tropicalCyclonePosition>
@@ -149,7 +149,7 @@
                 </iwxxm:SIGMETPosition>
             </iwxxm:member>
             <iwxxm:tropicalCyclonePosition>
-                <gml:Point gml:id="uuid.1e0ca159-77e7-4d85-8ace-44aadf52f9af">
+                <gml:Point gml:id="uuid.1e0ca159-77e7-4d85-8ace-44aadf52f9af" srsDimension="2" axisLabels="Lat Long" srsName="http://www.opengis.net/def/crs/EPSG/0/4326">
                     <gml:pos>27.6667 -73.75</gml:pos>
                 </gml:Point>
             </iwxxm:tropicalCyclonePosition>

diff --git a/IWXXM/examples/sigmet-VA-EGGX.xml b/IWXXM/examples/sigmet-VA-EGGX.xml
@@ -91,11 +91,7 @@ EGGX SHANWICK OCEANIC FIR VA ERUPTION MT HEKLA PSN N6359 W01940 VA CLD OBS AT 16
                             <aixm:upperLimit uom="FL">550</aixm:upperLimit>
                             <aixm:upperLimitReference>STD</aixm:upperLimitReference>
                             <aixm:horizontalProjection>
-                                <aixm:Surface gml:id="uuid.99f0ea38-755d-4435-b7c7-7cc5afcce237"
-                                    uomLabels="deg deg"
-                                    axisLabels="Lat Lon"
-                                    srsDimension="2"
-                                    srsName="http://www.opengis.net/def/crs/EPSG/0/4326">
+                                <aixm:Surface gml:id="uuid.99f0ea38-755d-4435-b7c7-7cc5afcce237" srsDimension="2" axisLabels="Lat Long" srsName="http://www.opengis.net/def/crs/EPSG/0/4326">
                                     <gml:polygonPatches>
                                         <gml:PolygonPatch>
                                             <gml:exterior>
@@ -132,7 +128,7 @@ EGGX SHANWICK OCEANIC FIR VA ERUPTION MT HEKLA PSN N6359 W01940 VA CLD OBS AT 16
                     <iwxxm:geometry>
                         <aixm:AirspaceVolume gml:id="uuid.e985f12a-5e11-433c-aa5e-699eecb0c244">
                             <aixm:horizontalProjection>
-                                <aixm:Surface gml:id="uuid.a667da6f-fb8a-4029-93f3-509ab9408220" uomLabels="deg deg" axisLabels="Lat Lon" srsDimension="2" srsName="http://www.opengis.net/def/crs/EPSG/0/4326">
+                                <aixm:Surface gml:id="uuid.a667da6f-fb8a-4029-93f3-509ab9408220" srsDimension="2" axisLabels="Lat Long" srsName="http://www.opengis.net/def/crs/EPSG/0/4326">
                                     <gml:polygonPatches>
                                         <gml:PolygonPatch>
                                             <gml:exterior>
@@ -161,7 +157,7 @@ EGGX SHANWICK OCEANIC FIR VA ERUPTION MT HEKLA PSN N6359 W01940 VA CLD OBS AT 16
         <metce:Volcano gml:id="uuid.99646618-9ec7-47c0-8b50-daba5b6b1da9">
             <metce:name>MT HEKLA</metce:name>
             <metce:position>
-                <gml:Point gml:id="uuid.ff6b0574-ed4a-44ee-9508-316eb8badd66" uomLabels="deg deg" axisLabels="Lat Lon" srsDimension="2" srsName="http://www.opengis.net/def/crs/EPSG/0/4326">
+                <gml:Point gml:id="uuid.ff6b0574-ed4a-44ee-9508-316eb8badd66" srsDimension="2" axisLabels="Lat Long" srsName="http://www.opengis.net/def/crs/EPSG/0/4326">
                     <gml:pos>63.98 -19.67</gml:pos>
                 </gml:Point>
             </metce:position>