Skip to content

Commit d256573

Browse files
mattjdnvolearytd
andauthored
append: Minor fixes. (#5741)
* Minor fixes. refs: #5740 * Copyright fix refs: #5740 * update pg key --------- Co-authored-by: olearytd <timothy.oleary@maxar.com>
1 parent a43b5cc commit d256573

File tree

4 files changed

+14
-8
lines changed

4 files changed

+14
-8
lines changed

hoot-core/src/main/cpp/hoot/core/io/OgrWriter.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* This will properly maintain the copyright information. Maxar
2323
* copyrights will be updated automatically.
2424
*
25-
* @copyright Copyright (C) 2015-2023 Maxar (http://www.maxar.com/)
25+
* @copyright Copyright (C) 2015-2024 Maxar (http://www.maxar.com/)
2626
*/
2727
#include "OgrWriter.h"
2828

@@ -654,7 +654,10 @@ void OgrWriter::_addFeature(OGRLayer* layer, const std::shared_ptr<Feature>& f,
654654

655655
// If the field DOESN'T exist in the output layer, skip it.
656656
if (poFeature->GetFieldIndex(ba.constData()) == -1)
657+
{
658+
LOG_DEBUG("Field " << ba.constData() << " does not exist. Skipping");
657659
continue;
660+
}
658661

659662
switch (v.type())
660663
{

hoot-services/src/main/java/hoot/services/controllers/export/ExportCommand.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* This will properly maintain the copyright information. Maxar
2323
* copyrights will be updated automatically.
2424
*
25-
* @copyright Copyright (C) 2016-2023 Maxar (http://www.maxar.com/)
25+
* @copyright Copyright (C) 2016-2024 Maxar (http://www.maxar.com/)
2626
*/
2727
package hoot.services.controllers.export;
2828

@@ -88,7 +88,6 @@ class ExportCommand extends ExternalCommand {
8888

8989
//Appends data to a blank fgdb. The template is either stored with translation or with the "local" ones.
9090
private void appendToFGDB() {
91-
9291
// Split the translation string: "translations/TDSv71.js"
9392
String[] tTrans = params.getTranslation().split("/");
9493
String templateName = tTrans[1].replace(".js",".tgz");
@@ -116,6 +115,10 @@ private void appendToFGDB() {
116115
ExternalCommand untarFileCommand = new UnTARFileCommand(exportTemplate, outputDir, this.getClass());
117116
untarFileCommand.execute();
118117
}
118+
else {
119+
params.setAppend(false);
120+
}
121+
119122
}
120123

121124
List<String> getCommonExportHootOptions() {

scripts/schema/hootLibrary.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#* This will properly maintain the copyright information. Maxar
2323
#* copyrights will be updated automatically.
2424
#*
25-
#* @copyright Copyright (C) 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Maxar (http://www.maxar.com/)
25+
#* @copyright Copyright (C) 2015-2024 Maxar (http://www.maxar.com/)
2626

2727
#*/
2828

@@ -98,7 +98,7 @@ def printCopyright():
9898
* This will properly maintain the copyright information. Maxar
9999
* copyrights will be updated automatically.
100100
*
101-
* @copyright Copyright (C) 2015, 2016, 2017, 2018, 2019, 2020, 2021 2022 2023 Maxar (http://www.maxar.com/)
101+
* @copyright Copyright (C) 2015-2024 Maxar (http://www.maxar.com/)
102102
*/
103103
104104
////

translations/translate.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1559,9 +1559,9 @@ translate = {
15591559
// addSingleO2sFeature - Add a single o2s feature to a schema
15601560
addSingleO2sFeature: function(schema)
15611561
{
1562-
schema.push({ name:'o2s_A',desc:'o2s',geom:'Area',columns:[ {name:'tag1',desc:'Tag List',type:'String'/*,length:'8192'*/}] });
1563-
schema.push({ name:'o2s_L',desc:'o2s',geom:'Line',columns:[ {name:'tag1',desc:'Tag List',type:'String'/*,length:'8192'*/}] });
1564-
schema.push({ name:'o2s_P',desc:'o2s',geom:'Point',columns:[ {name:'tag1',desc:'Tag List',type:'String'/*,length:'8192'*/}] });
1562+
schema.push({ name:'o2s_A',desc:'o2s',geom:'Area',columns:[ {name:'tag1',desc:'Tag List',type:'String',length:'8192'}] });
1563+
schema.push({ name:'o2s_L',desc:'o2s',geom:'Line',columns:[ {name:'tag1',desc:'Tag List',type:'String',length:'8192'}] });
1564+
schema.push({ name:'o2s_P',desc:'o2s',geom:'Point',columns:[ {name:'tag1',desc:'Tag List',type:'String',length:'8192'}] });
15651565

15661566
return schema;
15671567
}, // End addSingleO2sFeature

0 commit comments

Comments
 (0)