[incubator-baremaps] branch main updated: Improve ip to location workflow

[bchapuis]

This is an automated email from the ASF dual-hosted git repository.

bchapuis pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-baremaps.git


The following commit(s) were added to refs/heads/main by this push:
     new c8e6dc66 Improve ip to location workflow
c8e6dc66 is described below

commit c8e6dc6606daec4678cacc3223706a685d774d0d
Author: Bertil Chapuis <bchap...@gmail.com>
AuthorDate: Mon Apr 24 15:05:46 2023 +0200

    Improve ip to location workflow
---
 .../java/org/apache/baremaps/config}/ConfigReader.java    |  0
 .../org/apache/baremaps/config}/DefaultObjectMapper.java  |  0
 examples/ip-to-location/workflow.js                       | 15 ++++++---------
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git 
a/baremaps-server/src/main/java/org/apache/baremaps/server/ConfigReader.java 
b/baremaps-core/src/main/java/org/apache/baremaps/config/ConfigReader.java
similarity index 100%
rename from 
baremaps-server/src/main/java/org/apache/baremaps/server/ConfigReader.java
rename to 
baremaps-core/src/main/java/org/apache/baremaps/config/ConfigReader.java
diff --git 
a/baremaps-server/src/main/java/org/apache/baremaps/server/DefaultObjectMapper.java
 
b/baremaps-core/src/main/java/org/apache/baremaps/config/DefaultObjectMapper.java
similarity index 100%
rename from 
baremaps-server/src/main/java/org/apache/baremaps/server/DefaultObjectMapper.java
rename to 
baremaps-core/src/main/java/org/apache/baremaps/config/DefaultObjectMapper.java
diff --git a/examples/ip-to-location/workflow.js 
b/examples/ip-to-location/workflow.js
index b83cb907..8fc62eb6 100644
--- a/examples/ip-to-location/workflow.js
+++ b/examples/ip-to-location/workflow.js
@@ -34,12 +34,9 @@ const nics = [
     {url: "https://ftp.ripe.net/ripe/dbase/ripe.db.gz";, filename: "ripe.db"},
 ];
 
-const geonamesUrl =
-    "https://download.geonames.org/export/dump/allCountries.zip";;
-
 // Iterate over nic urls to create a list of downloads and ungzip
 const fetchAndUnzipNic = nics.map((nic, index) => ({
-    id: `fetch-nic-${index}`,
+    id: `fetch-nic-${nic.filename.replace(".", "-")}`,
     needs: [],
     tasks: [
         {
@@ -56,13 +53,13 @@ const fetchAndUnzipNic = nics.map((nic, index) => ({
 }));
 
 // Fetch and unzip Geonames
-const FetchAndUnzipGeonames = {
+const fetchAndUnzipGeonames = {
     id: "fetch-geonames-allcountries",
     needs: [],
     tasks: [
         {
             type: "DownloadUrl",
-            url: geonamesUrl,
+            url: "https://download.geonames.org/export/dump/allCountries.zip";,
             path: "downloads/geonames-allcountries.zip",
             force: true
         },
@@ -77,7 +74,7 @@ const FetchAndUnzipGeonames = {
 // Create the Geocoder index
 const createGeonamesIndex = {
     id: "geocoder-index",
-    needs: [FetchAndUnzipGeonames.id],
+    needs: [fetchAndUnzipGeonames.id],
     tasks: [
         {
             type: "CreateGeonamesIndex",
@@ -90,7 +87,7 @@ const createGeonamesIndex = {
 // Create the iploc database
 const createIplocIndex = {
     id: "iploc-index",
-    needs: fetchAndUnzipNic.map(e => e.id).concat([createGeonamesIndex.id]),
+    needs: [createGeonamesIndex.id, ...fetchAndUnzipNic.map(e => e.id)],
     tasks: [
         {
             type: "CreateIplocIndex",
@@ -101,4 +98,4 @@ const createIplocIndex = {
     ]
 };
 
-export default {"steps": fetchAndUnzipNic.concat([FetchAndUnzipGeonames, 
createGeonamesIndex, createIplocIndex])};
+export default {"steps": [...fetchAndUnzipNic, fetchAndUnzipGeonames, 
createGeonamesIndex, createIplocIndex]};