From 26afb6f075f80bc676b56866824a6070a444dffe Mon Sep 17 00:00:00 2001
From: Brian Hatchl <brian.hatchl@maxar.com>
Date: Mon, 23 Aug 2021 14:57:03 -0400
Subject: [PATCH 1/2] add test with two failures due to bug

---
 translations/test/multipolygon_relation.js | 121 +++++++++++++++++++++
 1 file changed, 121 insertions(+)
 create mode 100644 translations/test/multipolygon_relation.js

diff --git a/translations/test/multipolygon_relation.js b/translations/test/multipolygon_relation.js
new file mode 100644
index 0000000000..7d4abdf160
--- /dev/null
+++ b/translations/test/multipolygon_relation.js
@@ -0,0 +1,121 @@
+var assert = require('assert'),
+    DOMParser = new require('xmldom').DOMParser,
+    parser = new DOMParser();
+
+var server = require('../TranslationServer.js');
+
+describe('TranslationServer', function () {
+
+    it('should translate a multipolygon relation from osm -> mcgp with error', function() {
+
+        var data = '<osm version="0.6" upload="true" generator="hootenanny">\
+                        <way id="-19" visible="true">\
+                            <nd ref="-10" />\
+                            <nd ref="-11" />\
+                            <nd ref="-12" />\
+                            <nd ref="-13" />\
+                            <nd ref="-10" />\
+                        </way>\
+                        <way id="-20" visible="true">\
+                            <nd ref="-3" />\
+                            <nd ref="-4" />\
+                            <nd ref="-5" />\
+                            <nd ref="-6" />\
+                            <nd ref="-3" />\
+                        </way>\
+                        <relation visible="true" id="-38">\
+                        <member type="way" ref="-19" role="outer"/>\
+                        <member type="way" ref="-20" role="outer"/>\
+                        <tag k="type" v="multipolygon"/>\
+                      </relation>\
+                    </osm>';
+
+        var osm_xml = server.handleInputs({
+            osm: data,
+            method: 'POST',
+            translation: 'MGCP',
+            path: '/translateTo'
+        });
+
+        // console.log(osm_xml);
+
+        var xml = parser.parseFromString(osm_xml);
+
+        assert.equal(xml.getElementsByTagName("osm")[0].getAttribute("schema"), "MGCP");
+        assert.equal(xml.getElementsByTagName("tag")[0].getAttribute("k"), "error");
+        assert.equal(xml.getElementsByTagName("tag")[0].getAttribute("v"), "No Valid Feature Code");
+
+    });
+
+    it('should translate an invalid tagged relation from osm -> mcgp with error', function() {
+
+        var data = '<osm version="0.6" upload="true" generator="hootenanny">\
+                        <way id="-19" visible="true">\
+                            <nd ref="-10" />\
+                            <nd ref="-11" />\
+                            <nd ref="-12" />\
+                            <nd ref="-13" />\
+                            <nd ref="-10" />\
+                        </way>\
+                        <way id="-20" visible="true">\
+                            <nd ref="-3" />\
+                            <nd ref="-4" />\
+                            <nd ref="-5" />\
+                            <nd ref="-6" />\
+                            <nd ref="-3" />\
+                        </way>\
+                        <relation visible="true" id="-38">\
+                        <member type="way" ref="-19" role="outer"/>\
+                        <member type="way" ref="-20" role="outer"/>\
+                        <tag k="foo" v="bar"/>\
+                      </relation>\
+                    </osm>';
+
+        var osm_xml = server.handleInputs({
+            osm: data,
+            method: 'POST',
+            translation: 'MGCP',
+            path: '/translateTo'
+        });
+
+        // console.log(osm_xml);
+
+        var xml = parser.parseFromString(osm_xml);
+
+        assert.equal(xml.getElementsByTagName("osm")[0].getAttribute("schema"), "MGCP");
+        assert.equal(xml.getElementsByTagName("tag")[0].getAttribute("k"), "error");
+        assert.equal(xml.getElementsByTagName("tag")[0].getAttribute("v"), "No Valid Feature Code");
+
+    });
+
+    it('should translate an invalid tagged way from osm -> mcgp with error', function() {
+
+        var data = '<osm version="0.6" upload="true" generator="hootenanny">\
+                        <way id="-19" visible="true">\
+                            <nd ref="-10" />\
+                            <nd ref="-11" />\
+                            <nd ref="-12" />\
+                            <nd ref="-13" />\
+                            <nd ref="-10" />\
+                            <tag k="foo" v="bar"/>\
+                        </way>\
+                    </osm>';
+
+        var osm_xml = server.handleInputs({
+            osm: data,
+            method: 'POST',
+            translation: 'MGCP',
+            path: '/translateTo'
+        });
+
+        // console.log(osm_xml);
+
+        var xml = parser.parseFromString(osm_xml);
+
+        assert.equal(xml.getElementsByTagName("osm")[0].getAttribute("schema"), "MGCP");
+        assert.equal(xml.getElementsByTagName("tag")[0].getAttribute("k"), "error");
+        assert.equal(xml.getElementsByTagName("tag")[0].getAttribute("v"), "No Valid Feature Code");
+
+    });
+
+});

From 626a3045d3c75653aca735719136447ca851d40b Mon Sep 17 00:00:00 2001
From: "Matt C. Jackson" <matthew.jackson@digitalglobe.com>
Date: Thu, 26 Aug 2021 05:53:47 -0400
Subject: [PATCH 2/2] Tweaked the multipolygon relation test

---
 translations/test/multipolygon_relation.js | 111 ++++++++++++---------
 1 file changed, 65 insertions(+), 46 deletions(-)

diff --git a/translations/test/multipolygon_relation.js b/translations/test/multipolygon_relation.js
index 7d4abdf160..28d39270c4 100644
--- a/translations/test/multipolygon_relation.js
+++ b/translations/test/multipolygon_relation.js
@@ -8,27 +8,34 @@ describe('TranslationServer', function () {
 
     it('should translate a multipolygon relation from osm -> mcgp with error', function() {
 
-        var data = '<osm version="0.6" upload="true" generator="hootenanny">\
-                        <way id="-19" visible="true">\
-                            <nd ref="-10" />\
-                            <nd ref="-11" />\
-                            <nd ref="-12" />\
-                            <nd ref="-13" />\
-                            <nd ref="-10" />\
-                        </way>\
-                        <way id="-20" visible="true">\
-                            <nd ref="-3" />\
-                            <nd ref="-4" />\
-                            <nd ref="-5" />\
-                            <nd ref="-6" />\
-                            <nd ref="-3" />\
-                        </way>\
-                        <relation visible="true" id="-38">\
-                        <member type="way" ref="-19" role="outer"/>\
-                        <member type="way" ref="-20" role="outer"/>\
-                        <tag k="type" v="multipolygon"/>\
-                      </relation>\
-                    </osm>';
+        var data = "<?xml version='1.0' encoding='UTF-8'?> <osm version='0.6' generator='JOSM'> \
+          <node id='-101752' action='modify' visible='true' lat='0.0260960581' lon='-0.03260884481' /> \
+          <node id='-101754' action='modify' visible='true' lat='0.00696194343' lon='-0.03808856805' /> \
+          <node id='-101756' action='modify' visible='true' lat='-0.0042669976' lon='-0.026859627' /> \
+          <node id='-101757' action='modify' visible='true' lat='-0.00552463899' lon='0.00936493684' /> \
+          <node id='-101758' action='modify' visible='true' lat='0.01693324286' lon='0.01068995188' /> \
+          <node id='-101761' action='modify' visible='true' lat='0.01540610694' lon='-0.02317653433' /> \
+          <node id='-101762' action='modify' visible='true' lat='0.00920773162' lon='-0.02641046935' /> \
+          <node id='-101763' action='modify' visible='true' lat='0.00768059566' lon='-0.0170679904' /> \
+          <node id='-101765' action='modify' visible='true' lat='0.01226200353' lon='-0.00494073406' /> \
+          <node id='-101766' action='modify' visible='true' lat='0.00884840551' lon='0.00458140795' /> \
+          <node id='-101767' action='modify' visible='true' lat='0.00399750301' lon='-0.00314410349' /> \
+          <way id='-101782' action='modify' visible='true'> \
+            <nd ref='-101752' /> <nd ref='-101754' /> <nd ref='-101756' /> <nd ref='-101757' /> <nd ref='-101758' /> <nd ref='-101752' /> \
+          </way> \
+          <way id='-101790' action='modify' visible='true'> \
+            <nd ref='-101761' /> <nd ref='-101762' /> <nd ref='-101763' /> <nd ref='-101761' /> \
+          </way> \
+          <way id='-101793' action='modify' visible='true'> \
+            <nd ref='-101765' /> <nd ref='-101766' /> <nd ref='-101767' /> <nd ref='-101765' /> \
+          </way> \
+          <relation id='-99748' action='modify' visible='true'> \
+            <member type='way' ref='-101790' role='inner' /> \
+            <member type='way' ref='-101793' role='inner' /> \
+            <member type='way' ref='-101782' role='outer' /> \
+            <tag k='type' v='multipolygon' /> \
+          </relation> \
+        </osm>";
 
         var osm_xml = server.handleInputs({
             osm: data,
@@ -42,34 +49,45 @@ describe('TranslationServer', function () {
         var xml = parser.parseFromString(osm_xml);
 
         assert.equal(xml.getElementsByTagName("osm")[0].getAttribute("schema"), "MGCP");
-        assert.equal(xml.getElementsByTagName("tag")[0].getAttribute("k"), "error");
-        assert.equal(xml.getElementsByTagName("tag")[0].getAttribute("v"), "No Valid Feature Code");
 
+        // We expect to see  "type=multipolygon" as the ONLY tag
+        assert.equal(xml.getElementsByTagName("tag")[0].getAttribute("k"), "type");
+        assert.equal(xml.getElementsByTagName("tag")[0].getAttribute("v"), "multipolygon");
+
+        assert.equal(xml.getElementsByTagName("tag").length,1);
     });
 
     it('should translate an invalid tagged relation from osm -> mcgp with error', function() {
 
-        var data = '<osm version="0.6" upload="true" generator="hootenanny">\
-                        <way id="-19" visible="true">\
-                            <nd ref="-10" />\
-                            <nd ref="-11" />\
-                            <nd ref="-12" />\
-                            <nd ref="-13" />\
-                            <nd ref="-10" />\
-                        </way>\
-                        <way id="-20" visible="true">\
-                            <nd ref="-3" />\
-                            <nd ref="-4" />\
-                            <nd ref="-5" />\
-                            <nd ref="-6" />\
-                            <nd ref="-3" />\
-                        </way>\
-                        <relation visible="true" id="-38">\
-                        <member type="way" ref="-19" role="outer"/>\
-                        <member type="way" ref="-20" role="outer"/>\
-                        <tag k="foo" v="bar"/>\
-                      </relation>\
-                    </osm>';
+        var data = "<?xml version='1.0' encoding='UTF-8'?> <osm version='0.6' generator='JOSM'> \
+          <node id='-101752' action='modify' visible='true' lat='0.0260960581' lon='-0.03260884481' /> \
+          <node id='-101754' action='modify' visible='true' lat='0.00696194343' lon='-0.03808856805' /> \
+          <node id='-101756' action='modify' visible='true' lat='-0.0042669976' lon='-0.026859627' /> \
+          <node id='-101757' action='modify' visible='true' lat='-0.00552463899' lon='0.00936493684' /> \
+          <node id='-101758' action='modify' visible='true' lat='0.01693324286' lon='0.01068995188' /> \
+          <node id='-101761' action='modify' visible='true' lat='0.01540610694' lon='-0.02317653433' /> \
+          <node id='-101762' action='modify' visible='true' lat='0.00920773162' lon='-0.02641046935' /> \
+          <node id='-101763' action='modify' visible='true' lat='0.00768059566' lon='-0.0170679904' /> \
+          <node id='-101765' action='modify' visible='true' lat='0.01226200353' lon='-0.00494073406' /> \
+          <node id='-101766' action='modify' visible='true' lat='0.00884840551' lon='0.00458140795' /> \
+          <node id='-101767' action='modify' visible='true' lat='0.00399750301' lon='-0.00314410349' /> \
+          <way id='-101782' action='modify' visible='true'> \
+            <nd ref='-101752' /> <nd ref='-101754' /> <nd ref='-101756' /> <nd ref='-101757' /> <nd ref='-101758' /> <nd ref='-101752' /> \
+          </way> \
+          <way id='-101790' action='modify' visible='true'> \
+            <nd ref='-101761' /> <nd ref='-101762' /> <nd ref='-101763' /> <nd ref='-101761' /> \
+          </way> \
+          <way id='-101793' action='modify' visible='true'> \
+            <nd ref='-101765' /> <nd ref='-101766' /> <nd ref='-101767' /> <nd ref='-101765' /> \
+          </way> \
+          <relation id='-99748' action='modify' visible='true'> \
+            <member type='way' ref='-101790' role='inner' /> \
+            <member type='way' ref='-101793' role='inner' /> \
+            <member type='way' ref='-101782' role='outer' /> \
+            <tag k='type' v='multipolygon' /> \
+            <tag k='foo' v='bar' /> \
+          </relation> \
+        </osm>";
 
         var osm_xml = server.handleInputs({
             osm: data,
@@ -83,8 +101,9 @@ describe('TranslationServer', function () {
         var xml = parser.parseFromString(osm_xml);
 
         assert.equal(xml.getElementsByTagName("osm")[0].getAttribute("schema"), "MGCP");
-        assert.equal(xml.getElementsByTagName("tag")[0].getAttribute("k"), "error");
-        assert.equal(xml.getElementsByTagName("tag")[0].getAttribute("v"), "No Valid Feature Code");
+        // NOTE: tag[0] == "type=multipolygon"
+        assert.equal(xml.getElementsByTagName("tag")[1].getAttribute("k"), "error");
+        assert.equal(xml.getElementsByTagName("tag")[1].getAttribute("v"), "No Valid Feature Code");
 
     });