Add PLANET_DUMP_NG_METADATA_URL as env var to add metadata

Author: Rub21

images/full-history/start.sh

@@ -101,13 +101,22 @@ upload_planet_file() {
 # ===============================
 
 if [ "$PLANET_EXPORT_METHOD" == "planet-dump-ng" ]; then
-	download_dump_file
-	echo "Generating history planet file with planet-dump-ng..."
-	export PLANET_EPOCH_DATE="$PLANET_EPOCH_DATE"
-	planet-dump-ng \
-		--dump-file "$dumpFile" \
-		--history-pbf "$local_planetHistoryPBFFile"
-
+    download_dump_file
+    echo "Generating history planet file with planet-dump-ng..."
+    export PLANET_EPOCH_DATE="$PLANET_EPOCH_DATE"
+
+    if [ -n "$PLANET_DUMP_NG_METADATA_URL" ]; then
+        echo "Downloading metadata file..."
+        curl "$PLANET_DUMP_NG_METADATA_URL" -o metadata.yml
+        planet-dump-ng \
+            --dump-file "$dumpFile" \
+            --history-pbf "$local_planetHistoryPBFFile" \
+            -M metadata.yml
+    else
+        planet-dump-ng \
+            --dump-file "$dumpFile" \
+            --history-pbf "$local_planetHistoryPBFFile"
+    fi
 elif [ "$PLANET_EXPORT_METHOD" == "osmosis" ]; then
 	echo "Generating history planet file with osmosis..."
 	# Creating full history

images/planet-dump/start.sh

@@ -100,11 +100,20 @@ upload_planet_file() {
 # ===============================
 
 if [ "$PLANET_EXPORT_METHOD" == "planet-dump-ng" ]; then
-	download_dump_file
-	echo "Generating planet file with planet-dump-ng..."
-	planet-dump-ng \
-		--dump-file "$dumpFile" \
-		--pbf "$local_planetPBFFile"
+    download_dump_file
+    echo "Generating planet file with planet-dump-ng..."
+
+    if [ -n "$PLANET_DUMP_NG_METADATA_URL" ]; then
+        curl "$PLANET_DUMP_NG_METADATA_URL" -o metadata.yml
+        planet-dump-ng \
+            --dump-file "$dumpFile" \
+            --pbf "$local_planetPBFFile" \
+            -M metadata.yml
+    else
+        planet-dump-ng \
+            --dump-file "$dumpFile" \
+            --pbf "$local_planetPBFFile"
+    fi
 elif [ "$PLANET_EXPORT_METHOD" == "osmosis" ]; then
 	echo "Generating planet file with osmosis..."
 	if [ -z "$MEMORY_JAVACMD_OPTIONS" ]; then

osm-seed/templates/jobs/full-history-job.yaml

@@ -51,6 +51,8 @@ spec:
                 value: {{ .Values.fullHistory.env.DUMP_CLOUD_URL | quote}}
               - name: PLANET_EPOCH_DATE
                 value: {{ .Values.fullHistory.env.PLANET_EPOCH_DATE | quote}}
+              - name: PLANET_DUMP_NG_METADATA_URL
+                value: {{ .Values.fullHistory.env.PLANET_DUMP_NG_METADATA_URL | quote}}
               # In case cloudProvider=aws
               {{- if eq .Values.cloudProvider "aws" }}
               - name: AWS_S3_BUCKET

osm-seed/templates/jobs/planet-dump-job.yaml

@@ -55,6 +55,8 @@ spec:
                 value: {{ .Values.planetDump.env.DUMP_CLOUD_URL | quote}}
               - name: PLANET_EPOCH_DATE
                 value: {{ .Values.planetDump.env.PLANET_EPOCH_DATE | quote}}
+              - name: PLANET_DUMP_NG_METADATA_URL
+                value: {{ .Values.planetDump.env.PLANET_DUMP_NG_METADATA_URL | quote}}
               # In case cloudProvider=aws
               {{- if eq .Values.cloudProvider "aws" }}
               - name: AWS_S3_BUCKET

osm-seed/values.yaml

@@ -262,9 +262,10 @@ fullHistory:
   schedule: "* * * * *"
   env:
     OVERWRITE_FHISTORY_FILE: false
-    PLANET_EXPORT_METHOD: osmosis
+    PLANET_EXPORT_METHOD: planet-dump-ng
     DUMP_CLOUD_URL: s3://osm-seed/db.dump
     PLANET_EPOCH_DATE: '1970-01-01'
+    PLANET_DUMP_NG_METADATA_URL: https://osmseed.org/metadata/planet-meta.yaml 
   resources:
     enabled: false
     requests:
@@ -348,7 +349,9 @@ planetDump:
   env:
     OVERWRITE_PLANET_FILE: false
     DUMP_CLOUD_URL : s3://osm-seed/db.dump
-    PLANET_EXPORT_METHOD: osmosis
+    PLANET_EXPORT_METHOD: planet-dump-ng
+    PLANET_EPOCH_DATE: '1970-01-01'
+    PLANET_DUMP_NG_METADATA_URL: https://osmseed.org/metadata/planet-meta.yaml 
   resources:
     enabled: false
     requests: