Small translation fixes (#4454)

* Fix for badly formed "other_tags" tag refs: #4430 * Schema fix refs: #4430 * Updated copyright header refs: #4430
ngageoint · Jan 15, 2021 · 0ec04c1 · 0ec04c1
1 parent 2c07b2e
commit 0ec04c1
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 7 deletions.
diff --git a/conf/schema/military.json b/conf/schema/military.json
@@ -44,6 +44,7 @@
         "description": "FCODE: SU001 - An installation designed for military use. For example, used to perform military operations, initiate forward movements, and/or furnish supplies. Often protected by fortifications or natural advantages.",
         "isA": "military",
         "name": "military=installation",
+        "geometries": ["node", "area"],
         "objectType": "tag",
         "similarTo": {
             "name": "landuse=installation",

diff --git a/conf/translations/TDSv70_Features.csv.gz b/conf/translations/TDSv70_Features.csv.gz
diff --git a/hoot-core/src/main/cpp/hoot/core/schema/PythonSchemaTranslator.cpp b/hoot-core/src/main/cpp/hoot/core/schema/PythonSchemaTranslator.cpp
@@ -22,7 +22,7 @@
  * This will properly maintain the copyright information. DigitalGlobe
  * copyrights will be updated automatically.
  *
- * @copyright Copyright (C) 2015, 2016, 2017, 2018, 2019, 2020 DigitalGlobe (http://www.digitalglobe.com/)
+ * @copyright Copyright (C) 2015, 2016, 2017, 2018, 2019, 2020, 2021 DigitalGlobe (http://www.digitalglobe.com/)
  */
 
 // Python redefines these two macros from /usr/include/features.h

diff --git a/translations/dnc_core.js b/translations/dnc_core.js
@@ -706,6 +706,26 @@ dnc = {
     if (tags['error:circular']) delete tags['error:circular'];
     if (tags['hoot:status']) delete tags['hoot:status'];
 
+    // If we use ogr2osm, the GDAL driver jams any tag it doesn't know about into an "other_tags" tag.
+    // We need to unpack this before we can do anything.
+    // Adding this because we might not be reading from OSM
+    if (tags.other_tags)
+    {
+      var tList = tags.other_tags.toString().replace(/\\/g,'').replace(/\"/g,'"').split('","');
+
+      delete tags.other_tags;
+
+      for (var val in tList)
+      {
+        vList = tList[val].split('"=>"');
+
+        tags[vList[0].replace('"','')] = vList[1].replace('"','');
+
+        // Debug
+        // print('val: ' + tList[val] + '  vList[0] = ' + vList[0] + '  vList[1] = ' + vList[1]);
+      }
+    }
+
     // Initial cleanup
     for (var i in tags)
     {

diff --git a/translations/ggdm30.js b/translations/ggdm30.js
@@ -1142,7 +1142,7 @@ ggdm30 = {
     // Adding this because we might not be reading from OSM
     if (tags.other_tags)
     {
-      var tList = tags.other_tags.split('","');
+      var tList = tags.other_tags.toString().replace(/\\/g,'').replace(/\"/g,'"').split('","');
 
       delete tags.other_tags;
 

diff --git a/translations/mgcp.js b/translations/mgcp.js
@@ -976,7 +976,7 @@ mgcp = {
     // Adding this because we might not be reading from OSM
     if (tags.other_tags)
     {
-      var tList = tags.other_tags.split('","');
+      var tList = tags.other_tags.toString().replace(/\\/g,'').replace(/\"/g,'"').split('","');
 
       delete tags.other_tags;
 

diff --git a/translations/tds40.js b/translations/tds40.js
@@ -1218,7 +1218,7 @@ tds40 = {
     // Adding this because we might not be reading from OSM
     if (tags.other_tags)
     {
-      var tList = tags.other_tags.split('","');
+      var tList = tags.other_tags.toString().replace(/\\/g,'').replace(/\"/g,'"').split('","');
 
       delete tags.other_tags;
 

diff --git a/translations/tds61.js b/translations/tds61.js
@@ -1211,7 +1211,7 @@ tds61 = {
     // Adding this because we might not be reading from OSM
     if (tags.other_tags)
     {
-      var tList = tags.other_tags.split('","');
+      var tList = tags.other_tags.toString().replace(/\\/g,'').replace(/\"/g,'"').split('","');
 
       delete tags.other_tags;
 

diff --git a/translations/tds70.js b/translations/tds70.js
@@ -1153,7 +1153,7 @@ tds70 = {
     // Adding this because we might not be reading from OSM
     if (tags.other_tags)
     {
-      var tList = tags.other_tags.split('","');
+      var tList = tags.other_tags.toString().replace(/\\/g,'').replace(/\"/g,'"').split('","');
 
       delete tags.other_tags;
 

diff --git a/translations/translate.js b/translations/translate.js
@@ -1499,7 +1499,7 @@ translate = {
     // We need to unpack this before we can do anything.
     if (attrs.other_tags)
     {
-      var tList = attrs.other_tags.split('","');
+      var tList = tags.other_tags.toString().replace(/\\/g,'').replace(/\"/g,'"').split('","');
 
       delete attrs.other_tags;