diff --git a/test-files/MGCPv3/AAL015-output.osm b/test-files/MGCPv3/AAL015-output.osm
index f1d29b8..866860f 100644
--- a/test-files/MGCPv3/AAL015-output.osm
+++ b/test-files/MGCPv3/AAL015-output.osm
@@ -40,19 +40,19 @@
<nd ref="-40"/>
<nd ref="-40"/>
<nd ref="-36"/>
- <tag k="width" v="25"/>
- <tag k="source:ingest:datetime" v="2019-02-28T07:15:05.016Z"/>
+ <tag k="source:accuracy:horizontal:category" v="accurate"/>
<tag k="source:name" v="very_high_resolution_commercial_monoscopic_imagery"/>
- <tag k="military" v="barracks"/>
- <tag k="source:accuracy:vertical:evaluation" v="fzd_evaluation_deferred"/>
- <tag k="source:accuracy:horizontal:evaluation" v="emc_product_specification"/>
- <tag k="building" v="yes"/>
- <tag k="uuid" v="{22ddf733-e638-4738-a52c-f3ca6f4f3789}"/>
<tag k="source" v="mgcp:aal015"/>
+ <tag k="area" v="yes"/>
+ <tag k="source:ingest:datetime" v="2019-08-07T15:29:33.050Z"/>
+ <tag k="source:accuracy:vertical:evaluation" v="fzd_evaluation_deferred"/>
<tag k="name" v="Barracks"/>
+ <tag k="military" v="barracks"/>
+ <tag k="uuid" v="{22ddf733-e638-4738-a52c-f3ca6f4f3789}"/>
<tag k="abandoned:building" v="yes"/>
<tag k="source:accuracy:horizontal" v="25"/>
- <tag k="source:accuracy:horizontal:category" v="accurate"/>
+ <tag k="source:accuracy:horizontal:evaluation" v="emc_product_specification"/>
+ <tag k="width" v="25"/>
<tag k="error:circular" v="28.65"/>
</way>
<way visible="true" id="-7" timestamp="1970-01-01T00:00:00Z" version="1">
@@ -62,19 +62,19 @@
<nd ref="-35"/>
<nd ref="-35"/>
<nd ref="-31"/>
- <tag k="width" v="25"/>
- <tag k="source:ingest:datetime" v="2019-02-28T07:15:05.015Z"/>
+ <tag k="source:accuracy:horizontal:category" v="accurate"/>
<tag k="source:name" v="very_high_resolution_commercial_monoscopic_imagery"/>
+ <tag k="source" v="mgcp:aal015"/>
+ <tag k="source:ingest:datetime" v="2019-08-07T15:29:33.050Z"/>
<tag k="source:accuracy:vertical:evaluation" v="fzd_evaluation_deferred"/>
- <tag k="source:accuracy:horizontal:evaluation" v="emc_product_specification"/>
- <tag k="condition" v="damaged"/>
<tag k="product" v="petroleum"/>
- <tag k="building" v="yes"/>
- <tag k="uuid" v="{22595df6-147c-4b6c-96ae-1b71036df59d}"/>
- <tag k="source" v="mgcp:aal015"/>
<tag k="name" v="Petroleum Facility"/>
+ <tag k="uuid" v="{22595df6-147c-4b6c-96ae-1b71036df59d}"/>
<tag k="source:accuracy:horizontal" v="25"/>
- <tag k="source:accuracy:horizontal:category" v="accurate"/>
+ <tag k="building" v="yes"/>
+ <tag k="source:accuracy:horizontal:evaluation" v="emc_product_specification"/>
+ <tag k="width" v="25"/>
+ <tag k="condition" v="damaged"/>
<tag k="error:circular" v="28.65"/>
</way>
<way visible="true" id="-6" timestamp="1970-01-01T00:00:00Z" version="1">
@@ -84,19 +84,19 @@
<nd ref="-30"/>
<nd ref="-30"/>
<nd ref="-26"/>
- <tag k="width" v="25"/>
- <tag k="source:ingest:datetime" v="2019-02-28T07:15:05.015Z"/>
+ <tag k="source:accuracy:horizontal:category" v="accurate"/>
<tag k="source:name" v="very_high_resolution_commercial_monoscopic_imagery"/>
+ <tag k="source" v="mgcp:aal015"/>
+ <tag k="amenity" v="place_of_worship"/>
+ <tag k="source:ingest:datetime" v="2019-08-07T15:29:33.049Z"/>
<tag k="source:accuracy:vertical:evaluation" v="fzd_evaluation_deferred"/>
- <tag k="source:accuracy:horizontal:evaluation" v="emc_product_specification"/>
- <tag k="condition" v="functional"/>
- <tag k="religion" v="muslim"/>
- <tag k="building" v="mosque"/>
<tag k="uuid" v="{21b59de9-1a5c-4afd-a235-36740d8c7b2a}"/>
- <tag k="source" v="mgcp:aal015"/>
<tag k="source:accuracy:horizontal" v="25"/>
- <tag k="source:accuracy:horizontal:category" v="accurate"/>
- <tag k="amenity" v="place_of_worship"/>
+ <tag k="building" v="mosque"/>
+ <tag k="source:accuracy:horizontal:evaluation" v="emc_product_specification"/>
+ <tag k="religion" v="muslim"/>
+ <tag k="width" v="25"/>
+ <tag k="condition" v="functional"/>
<tag k="error:circular" v="28.65"/>
</way>
<way visible="true" id="-5" timestamp="1970-01-01T00:00:00Z" version="1">
@@ -106,18 +106,18 @@
<nd ref="-25"/>
<nd ref="-25"/>
<nd ref="-21"/>
- <tag k="width" v="25"/>
- <tag k="source:ingest:datetime" v="2019-02-28T07:15:05.014Z"/>
+ <tag k="source:accuracy:horizontal:category" v="accurate"/>
<tag k="source:name" v="very_high_resolution_commercial_monoscopic_imagery"/>
+ <tag k="source" v="mgcp:aal015"/>
+ <tag k="source:ingest:datetime" v="2019-08-07T15:29:33.048Z"/>
<tag k="source:accuracy:vertical:evaluation" v="fzd_evaluation_deferred"/>
- <tag k="controlling_authority" v="international"/>
- <tag k="source:accuracy:horizontal:evaluation" v="emc_product_specification"/>
- <tag k="condition" v="functional"/>
- <tag k="building" v="school"/>
<tag k="uuid" v="{21acae65-f5e3-417a-a1bc-4765a030c507}"/>
- <tag k="source" v="mgcp:aal015"/>
<tag k="source:accuracy:horizontal" v="25"/>
- <tag k="source:accuracy:horizontal:category" v="accurate"/>
+ <tag k="building" v="school"/>
+ <tag k="source:accuracy:horizontal:evaluation" v="emc_product_specification"/>
+ <tag k="width" v="25"/>
+ <tag k="controlling_authority" v="international"/>
+ <tag k="condition" v="functional"/>
<tag k="error:circular" v="28.65"/>
</way>
<way visible="true" id="-4" timestamp="1970-01-01T00:00:00Z" version="1">
@@ -127,19 +127,19 @@
<nd ref="-20"/>
<nd ref="-20"/>
<nd ref="-16"/>
- <tag k="width" v="25"/>
- <tag k="source:ingest:datetime" v="2019-02-28T07:15:05.013Z"/>
+ <tag k="source:accuracy:horizontal:category" v="accurate"/>
<tag k="source:name" v="very_high_resolution_commercial_monoscopic_imagery"/>
+ <tag k="source" v="mgcp:aal015"/>
+ <tag k="amenity" v="bank"/>
+ <tag k="source:ingest:datetime" v="2019-08-07T15:29:33.048Z"/>
<tag k="source:accuracy:vertical:evaluation" v="fzd_evaluation_deferred"/>
- <tag k="controlling_authority" v="joint_military_civilian"/>
- <tag k="source:accuracy:horizontal:evaluation" v="emc_product_specification"/>
- <tag k="condition" v="destroyed"/>
- <tag k="building" v="yes"/>
<tag k="uuid" v="{2167f8ac-6eb9-419e-bbd0-83249f186b1c}"/>
- <tag k="source" v="mgcp:aal015"/>
<tag k="source:accuracy:horizontal" v="25"/>
- <tag k="source:accuracy:horizontal:category" v="accurate"/>
- <tag k="amenity" v="bank"/>
+ <tag k="building" v="yes"/>
+ <tag k="source:accuracy:horizontal:evaluation" v="emc_product_specification"/>
+ <tag k="width" v="25"/>
+ <tag k="controlling_authority" v="joint_military_civilian"/>
+ <tag k="condition" v="destroyed"/>
<tag k="error:circular" v="28.65"/>
</way>
<way visible="true" id="-3" timestamp="1970-01-01T00:00:00Z" version="1">
@@ -149,20 +149,20 @@
<nd ref="-15"/>
<nd ref="-15"/>
<nd ref="-11"/>
- <tag k="width" v="25"/>
- <tag k="source:ingest:datetime" v="2019-02-28T07:15:05.013Z"/>
+ <tag k="source:accuracy:horizontal:category" v="accurate"/>
<tag k="source:name" v="very_high_resolution_commercial_monoscopic_imagery"/>
- <tag k="construction" v="yes"/>
+ <tag k="source" v="mgcp:aal015"/>
+ <tag k="amenity" v="prison"/>
+ <tag k="source:ingest:datetime" v="2019-08-07T15:29:33.047Z"/>
<tag k="source:accuracy:vertical:evaluation" v="fzd_evaluation_deferred"/>
- <tag k="note" v="Prison"/>
- <tag k="controlling_authority" v="military"/>
- <tag k="source:accuracy:horizontal:evaluation" v="emc_product_specification"/>
- <tag k="building" v="construction"/>
<tag k="uuid" v="{2144e43d-52f7-439b-a7af-0f87139c196b}"/>
- <tag k="source" v="mgcp:aal015"/>
<tag k="source:accuracy:horizontal" v="25"/>
- <tag k="source:accuracy:horizontal:category" v="accurate"/>
- <tag k="amenity" v="prison"/>
+ <tag k="note" v="Prison"/>
+ <tag k="building" v="construction"/>
+ <tag k="source:accuracy:horizontal:evaluation" v="emc_product_specification"/>
+ <tag k="construction" v="yes"/>
+ <tag k="width" v="25"/>
+ <tag k="controlling_authority" v="military"/>
<tag k="error:circular" v="28.65"/>
</way>
<way visible="true" id="-2" timestamp="1970-01-01T00:00:00Z" version="1">
@@ -172,19 +172,19 @@
<nd ref="-10"/>
<nd ref="-10"/>
<nd ref="-6"/>
- <tag k="width" v="25"/>
- <tag k="source:ingest:datetime" v="2019-02-28T07:15:05.012Z"/>
+ <tag k="source:accuracy:horizontal:category" v="accurate"/>
<tag k="source:name" v="very_high_resolution_commercial_monoscopic_imagery"/>
+ <tag k="source" v="mgcp:aal015"/>
+ <tag k="source:ingest:datetime" v="2019-08-07T15:29:33.047Z"/>
<tag k="source:accuracy:vertical:evaluation" v="fzd_evaluation_deferred"/>
+ <tag k="uuid" v="{2101f750-eb73-4c93-85bc-1193f8522ec0}"/>
+ <tag k="source:accuracy:horizontal" v="25"/>
<tag k="note" v="Sports Centre"/>
- <tag k="controlling_authority" v="national"/>
+ <tag k="building" v="yes"/>
<tag k="source:accuracy:horizontal:evaluation" v="emc_product_specification"/>
<tag k="leisure" v="sports_centre"/>
- <tag k="building" v="yes"/>
- <tag k="uuid" v="{2101f750-eb73-4c93-85bc-1193f8522ec0}"/>
- <tag k="source" v="mgcp:aal015"/>
- <tag k="source:accuracy:horizontal" v="25"/>
- <tag k="source:accuracy:horizontal:category" v="accurate"/>
+ <tag k="width" v="25"/>
+ <tag k="controlling_authority" v="national"/>
<tag k="error:circular" v="28.65"/>
</way>
<way visible="true" id="-1" timestamp="1970-01-01T00:00:00Z" version="1">
@@ -194,18 +194,18 @@
<nd ref="-5"/>
<nd ref="-5"/>
<nd ref="-1"/>
- <tag k="width" v="25"/>
- <tag k="source:ingest:datetime" v="2019-02-28T07:15:04.799Z"/>
+ <tag k="source:accuracy:horizontal:category" v="accurate"/>
<tag k="source:name" v="very_high_resolution_commercial_monoscopic_imagery"/>
+ <tag k="source" v="mgcp:aal015"/>
+ <tag k="amenity" v="community_centre"/>
+ <tag k="source:ingest:datetime" v="2019-08-07T15:29:32.988Z"/>
<tag k="source:accuracy:vertical:evaluation" v="fzd_evaluation_deferred"/>
- <tag k="note" v="Community Centre"/>
- <tag k="source:accuracy:horizontal:evaluation" v="emc_product_specification"/>
- <tag k="building" v="yes"/>
<tag k="uuid" v="{f9f1e2e7-7699-4dd7-8271-586970f42122}"/>
- <tag k="source" v="mgcp:aal015"/>
<tag k="source:accuracy:horizontal" v="25"/>
- <tag k="source:accuracy:horizontal:category" v="accurate"/>
- <tag k="amenity" v="community_centre"/>
+ <tag k="note" v="Community Centre"/>
+ <tag k="building" v="yes"/>
+ <tag k="source:accuracy:horizontal:evaluation" v="emc_product_specification"/>
+ <tag k="width" v="25"/>
<tag k="error:circular" v="28.65"/>
</way>
</osm>