enable use of custom config with temp dir and copying

in order to build nlmaps with a custom config, we create a temp directory and copy either the default there or the one specified with -c to build script. configParser requires this path.
PDOK · Apr 16, 2018 · 5f32cd4 · 5f32cd4
1 parent 5655f04
commit 5f32cd4
Show file tree

Hide file tree

Showing 5 changed files with 121 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@ npm-debug.log
 lerna-debug.log
 .vscode
 .nyc_output
+packages/config/.tmp
diff --git a/packages/lib/configParser.js b/packages/lib/configParser.js
@@ -1,4 +1,4 @@
-import config from '../config/config.js';
+import config from '../config/.tmp/config.js';
 
 const CONFIG = {};
 
@@ -87,4 +87,4 @@ parseMap(config.map);
 parseBase(config.basemaps);
 if(config.wms!==undefined)parseWMS(config.wms);
 if(config.geocoder!==undefined)parseGeocoder(config.geocoder);
-export { CONFIG };
+export { CONFIG };
diff --git a/packages/nlmaps/test/testconfig.js b/packages/nlmaps/test/testconfig.js
@@ -0,0 +1,97 @@
+export default {
+    "version": 0.1,    
+    "basemaps": {
+        "defaults": {
+            "crs": "EPSG:3857",
+            "attr": "Kaartgegevens &copy; <a href='https://www.kadaster.nl'>Kadaster</a> | <a href='https://www.verbeterdekaart.nl'>Verbeter de kaart</a>",
+            "minZoom": 6,
+            "maxZoom": 19,
+            "type": "wmts",
+            "format": "jpeg",
+            "url": "https://geodata.nationaalgeoregister.nl/tiles/service"
+        },
+        "layers": [
+            {
+                "name": "standaard",
+                "urlname": "brtachtergrondkaart"                
+            },
+            {
+                "name": "grijs",
+                "urlname": "brtachtergrondkaartgrijs"
+            },
+            {
+                "name": "pastel",
+                "urlname": "brtachtergrondkaartpastel"
+            },{
+                "name": "luchtfoto",
+                "urlname": "2016_ortho25",
+                "url": "https://geodata.nationaalgeoregister.nl/luchtfoto/rgb",
+                "format": "jpeg"
+            }
+        ]
+    },
+    "wms": {
+        "defaults": {
+            "url": "https://geodata.nationaalgeoregister.nl/{workSpaceName}/wms?",            
+            "version": "1.1.1",
+            "transparent": true,
+            "format": "image/png",
+            "minZoom": 0,
+            "maxZoom": 24
+        },
+        "layers": [
+            {
+                "name": "foobar",
+                "workSpaceName": "bash",
+                "layerName": "peachy"
+            },
+            {
+                "name": "gebouwen",
+                "workSpaceName": "bag",
+                "layerName": "pand"
+            },
+            {
+                "name": "percelen",
+                "workSpaceName": "bkadastralekaartv3ag",
+                "layerName": "kadastralekaart"
+            },
+            {
+                "name": "drone-no-fly-zones",
+                "workSpaceName": "dronenoflyzones",
+                "layerName": "luchtvaartgebieden,landingsite"
+            },
+            {
+                "name": "hoogte",
+                "workSpaceName": "ahn2",
+                "layerName": "ahn2_05m_int",
+                "styleName": "ahn2:ahn2_05m_detail"
+            },
+            {
+                "name": "gemeenten",
+                "workSpaceName": "bestuurlijkegrenzen",
+                "layerName": "gemeenten",
+                "styleName": "bestuurlijkegrenzen:bestuurlijkegrenzen_gemeentegrenzen"
+            },
+            {
+                "name": "provincies",
+                "workSpaceName": "bestuurlijkegrenzen",
+                "layerName": "provincies",
+                "styleName": "bestuurlijkegrenzen:bestuurlijkegrenzen_provinciegrenzen"
+            }
+        ]
+    },
+    "geocoder": {
+        "suggestUrl": "https://geodata.nationaalgeoregister.nl/locatieserver/v3/suggest?",
+        "lookupUrl": "https://geodata.nationaalgeoregister.nl/locatieserver/v3/lookup?"
+    },
+    "map": {
+        "style": 'standaard',
+        "center": {
+            "latitude": 52.093249,
+            "longitude": 5.111994
+        },
+        "zoom": 8,
+        "attribution": true,
+        "extent": [-180,-90,180,90]
+    }
+}
diff --git a/scripts/build.js b/scripts/build.js
@@ -13,8 +13,8 @@ if (helpers.args.watch) {
   rollup_args.unshift('--watch')
 }
 
+//create output directories for static assets if they don't exist yet
 tasks.forEach(task => {
-  //create output directories for static assets if they don't exist yet
   const assetsdirpath = 'packages/' + helpers.packagePath(task) + '/build/assets';
   if (!shell.test('-e', assetsdirpath)) {
     shell.mkdir('-p', assetsdirpath);
@@ -28,6 +28,20 @@ tasks.forEach(task => {
 })
 
 function main() {
+  //create temporary directory and copy config there.
+  //this is a workaround to be able to build nlmaps with a custom config.
+  const TEMPCONFDIR = 'packages/config/.tmp'
+  const DEFAULTCONFIGFILE = 'packages/config/config.js';
+  if (!shell.test('-e', TEMPCONFDIR)) {
+    shell.mkdir(TEMPCONFDIR);
+  }
+  if (helpers.args.config !== null) {
+    console.log('using custom config file ' + helpers.args.config);
+    shell.cp(helpers.args.config, TEMPCONFDIR + '/config.js' );
+  } else {
+    console.log('using default config file ' + DEFAULTCONFIGFILE);
+    shell.cp(DEFAULTCONFIGFILE, TEMPCONFDIR + '/config.js');
+  }
   //run each package's rollup command from the package's directory
   //and capture/log output
   tasks.forEach(task => {

diff --git a/scripts/helpers.js b/scripts/helpers.js
@@ -30,6 +30,12 @@ parser.addArgument(
     help: 'report coverage for unit tests'
   }
 );
+parser.addArgument(
+  [ '-c', '--config' ],
+  {
+    help: 'specify a custom config file to build nlmaps with'
+  }
+);
 
 const args = parser.parseArgs();