Merge branch 'master' into stage

Author: Yves Serrano

README.md

@@ -34,7 +34,8 @@ Add `www.local` and `django` to the 127.0.0.1 entry in `/etc/hosts` (for screens
 
 ```bash
 touch env.hosts.prod # required file, can be empty and edited later
-cp etc/nginx/www.local.dev etc/nginx/www.local.conf # default www.local.conf is not under version control
+# for local development add a symlink to the nginx configuration file, for production use a dedicated copy
+ln -s etc/nginx/www.local.dev etc/nginx/www.local.conf # default www.local.conf is not under version control
 ```
 
 download containers and start them

RELEASE.md

@@ -10,6 +10,10 @@
 - Added API for snapshot upload
 - Added site config for homepage_snippet and search_enabled
 
+*Upgrade notes*:
+- Upgrading to 0.7.0 changes to how snapshots are stored and hence requires a snapshot data migration
+- For local development symlinking the current nginx configuration is recommended (see README.md for details)
+
 ### 0.6.2
 [Released *2020-11-16*](https://bitbucket.org/cividi/gemeindescan-webui/commits/tag/0.6.2)
 

vue/src/components/SnapshotMap.vue

@@ -202,71 +202,81 @@ export default {
     },
 
     setupMapbox() {
-      this.geobounds = [
-        geostring2array(this.geojson.views[0].spec.bounds[0]),
-        geostring2array(this.geojson.views[0].spec.bounds[1])
-      ];
+      try {
+        this.geobounds = [
+          geostring2array(this.geojson.views[0].spec.bounds[0]),
+          geostring2array(this.geojson.views[0].spec.bounds[1])
+        ];
 
-      const lookupResources = {}; // name -> index
-      this.geojson.resources.forEach((resource, index) => {
-        lookupResources[resource.name] = index;
-      });
+        const lookupResources = {}; // name -> index
+        this.geojson.resources.forEach((resource, index) => {
+          lookupResources[resource.name] = index;
+        });
 
-      this.geojson.views[0].resources.forEach((resourceName) => {
-        this.layers.push(
-          this.geojson.resources[lookupResources[resourceName]]
-        );
-      });
+        this.geojson.views[0].resources.forEach((resourceName) => {
+          this.layers.push(
+            this.geojson.resources[lookupResources[resourceName]]
+          );
+        });
+      } catch (error) {
+        console.log(error);
+        this.isMapLoaded = true;
+      }
     },
 
     displayMapbox() {
-      L.mapbox.accessToken = process.env.VUE_APP_MAPBOX_ACCESSTOKEN;
-      const boxSize = 800;
-      const bounds = geoViewport.viewport(this.geobounds.flat(), [boxSize, boxSize]);
-      this.map = L.mapbox.map('map').setView(bounds.center, bounds.zoom);
-      this.layerContainer = new L.LayerGroup();
-      // default test layer // this.layerContainer.addLayer(L.mapbox.styleLayer('mapbox://styles/mapbox/light-v10'));
-      if (this.hash) { // full snapshot with hash
-        this.layers.forEach((layer) => {
-          if (layer.mediatype === 'application/vnd.mapbox-vector-tile') {
-            const tileLayer = L.mapbox.styleLayer(layer.path);
-            tileLayer.on('load', () => { this.isMapLoaded = true; });
-            this.layerContainer.addLayer(tileLayer);
-          } else if (layer.mediatype === 'application/geo+json') {
-            this.layerContainer.addLayer(L.mapbox.featureLayer(layer.data, {
-              attribution: this.geojson.views[0].spec.attribution
-            }));
-          } else if (layer.mediatype === 'application/vnd.simplestyle-extended') {
-            this.layerContainer.addLayer(this.createFeatureLayer(
-              layer.data.features, this.geojson.views[0].spec.attribution
+      try {
+        L.mapbox.accessToken = process.env.VUE_APP_MAPBOX_ACCESSTOKEN;
+        const boxSize = 800;
+        const bounds = geoViewport.viewport(this.geobounds.flat(), [boxSize, boxSize]);
+        this.map = L.mapbox.map('map').setView(bounds.center, bounds.zoom);
+        this.layerContainer = new L.LayerGroup();
+        // default test layer // this.layerContainer.addLayer(L.mapbox.styleLayer('mapbox://styles/mapbox/light-v10'));
+        if (this.hash) { // full snapshot with hash
+          this.layers.forEach((layer) => {
+            if (layer.mediatype === 'application/vnd.mapbox-vector-tile') {
+              const tileLayer = L.mapbox.styleLayer(layer.path);
+              tileLayer.on('load', () => { this.isMapLoaded = true; });
+              this.layerContainer.addLayer(tileLayer);
+            } else if (layer.mediatype === 'application/geo+json') {
+              this.layerContainer.addLayer(L.mapbox.featureLayer(layer.data, {
+                attribution: this.geojson.views[0].spec.attribution
+              }));
+            } else if (layer.mediatype === 'application/vnd.simplestyle-extended') {
+              this.layerContainer.addLayer(this.createFeatureLayer(
+                layer.data.features, this.geojson.views[0].spec.attribution
+              ));
+            }
+          });
+        } else if (this.bfsNumber) { // empty municipality
+          this.geojson.coordinates.forEach((polygon) => {
+            this.layerContainer.addLayer(L.polygon(polygon, { color: '#543076' }));
+          });
+          if (process.env.VUE_APP_MAPBOX_DEFAULT_STYLES) {
+            this.layerContainer.addLayer(L.mapbox.styleLayer(
+              process.env.VUE_APP_MAPBOX_DEFAULT_STYLES
             ));
           }
-        });
-      } else if (this.bfsNumber) { // empty municipality
-        this.geojson.coordinates.forEach((polygon) => {
-          this.layerContainer.addLayer(L.polygon(polygon, { color: '#543076' }));
-        });
-        if (process.env.VUE_APP_MAPBOX_DEFAULT_STYLES) {
-          this.layerContainer.addLayer(L.mapbox.styleLayer(
-            process.env.VUE_APP_MAPBOX_DEFAULT_STYLES
-          ));
         }
-      }
-      this.layerContainer.addTo(this.map);
-      L.control.scale({
-        metric: true,
-        imperial: false
-      }).addTo(this.map);
+        this.layerContainer.addTo(this.map);
+        L.control.scale({
+          metric: true,
+          imperial: false
+        }).addTo(this.map);
 
-      if (this.screenshotMode) {
-        // no zoom controls in screenshot mode
-        document.querySelector('.leaflet-control-zoom').style.display = 'none';
-      } else {
-        // no attribution in normal mode
-        document.querySelector('.leaflet-control-attribution').style.display = 'none';
-      }
-      if (this.screenshotIsThumbnail) {
-        document.querySelector('#mapinfo').style.visibility = 'hidden';
+        if (this.screenshotMode) {
+          // no zoom controls in screenshot mode
+          document.querySelector('.leaflet-control-zoom').style.display = 'none';
+        } else {
+          // no attribution in normal mode
+          document.querySelector('.leaflet-control-attribution').style.display = 'none';
+        }
+        if (this.screenshotIsThumbnail) {
+          document.querySelector('#mapinfo').style.visibility = 'hidden';
+        }
+      } catch (error) {
+        console.log(error);
+        this.isMapLoaded = true;
       }
       // L.control.zoom({ position: 'bottomleft' }).addTo(this.map);
       // this.map.addLayer(L.rectangle(this.geobounds, { color: 'red', weight: 1 }));