Fix the javascript regression failure. (#4455)

scripts/core/osm2ogrscript

@@ -5,7 +5,7 @@
 # Options for most exports
 HOOT_OPTS+= -D convert.ops=hoot::DecomposeBuildingRelationsVisitor
 HOOT_OPTS+= -D hootapi.db.writer.overwrite.map=true -D hootapi.db.writer.create.user=true
-HOOT_OPTS+= -D api.db.email=[email protected]
+HOOT_OPTS+= -D api.db.email=${TEST_EMAIL}
 
 # Add the option to append
 ifeq "$(append)" "true"
@@ -14,7 +14,7 @@ endif
 
 
 # Options for osm & osm.pbf export
-OSM_OPTS=-D hootapi.db.writer.create.user=true -D api.db.email=[email protected]
+OSM_OPTS=-D hootapi.db.writer.create.user=true -D api.db.email=${TEST_EMAIL}
 
 # Add the option to have status tags as text with "Input1" instead of "1" or "Unknown1"
 ifeq "$(textstatus)" "true"

test-files/cmd/glacial/ServiceExportOsm.sh

@@ -11,7 +11,8 @@ export outputfolder=$HOOT_HOME/tmp/$outputname
 export inputfile=DcGisRoads
 export input=$inputfile_$outputname
 export inputtype=db
-export HOOT_OPTS="-C Testing.conf -D hootapi.db.writer.create.user=true -D hootapi.db.writer.overwrite.map=true -D [email protected] -D writer.include.debug.tags=true --warn"
+export TEST_EMAIL="[email protected]"
+export HOOT_OPTS="-C Testing.conf -D hootapi.db.writer.create.user=true -D hootapi.db.writer.overwrite.map=true -D api.db.email=${TEST_EMAIL} -D writer.include.debug.tags=true --warn"
 
 echo "Ingest the data"
 hoot convert $HOOT_OPTS test-files/$inputfile.osm $DB_URL/$input
@@ -41,4 +42,4 @@ hoot db-delete $HOOT_OPTS $DB_URL/$input
 rm -rf $outputfolder
 
 # Delete the user
-PGPASSWORD=$DB_PASSWORD psql $PSQL_DB_AUTH -d $DB_NAME  -c "DELETE FROM users WHERE email='[email protected]';" > /dev/null
+PGPASSWORD=$DB_PASSWORD psql $PSQL_DB_AUTH -d $DB_NAME  -c "DELETE FROM users WHERE email='${TEST_EMAIL}';" > /dev/null

translations/tds61.js

@@ -542,7 +542,7 @@ tds61 = {
       translate.txtToOgr(newFeatures[i]['attrs'], newFeatures[i]['tags'], tds61.rules.txtBiased,transMap);
 
       // one 2 one - we call the version that knows about OTH fields
-      translate.applyOgrOne2One(newFeatures[i]['tags'], newFeatures[i]['attrs'], tds61.lookup, tds61.fcodeLookup,transMap);
+      translate.applyTdsOne2One(newFeatures[i]['tags'], newFeatures[i]['attrs'], tds61.lookup, tds61.fcodeLookup,transMap);
 
       // post processing
       tds61.applyToOgrPostProcessing(newFeatures[i]['tags'], newFeatures[i]['attrs'], geometryType, {});