Render maps with size corresponding to the screen

LeadingEdgeForum · Jul 5, 2017 · 8b1f7cc · 8b1f7cc
1 parent a2f5c31
commit 8b1f7cc
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 2 deletions.
diff --git a/src-server/workspace/image-renderer.js b/src-server/workspace/image-renderer.js
@@ -130,6 +130,16 @@ module.exports = function(authGuardian, mongooseConnection, webpack_middleware)
         }
         var mapID = new ObjectId(splitMapName[0]);
 
+        var width = Number(req.query.width);
+        if(!Number.isInteger(width) || width < 0 || width > 4000){
+          width = 1024;
+        }
+
+        var height = Number(req.query.height);
+        if(!Number.isInteger(height) || height < 0 || height > 2000){
+          height = 800;
+        }
+
         WardleyMap
             .findOne({
                 _id: mapID,
@@ -149,8 +159,8 @@ module.exports = function(authGuardian, mongooseConnection, webpack_middleware)
                     background: true,
                     coords: {
                         size: {
-                            width: 1280,
-                            height: 800
+                            width: width,
+                            height: height
                         }
                     }
                 };

diff --git a/src-ui/map-editor/MapEditorPage.js b/src-ui/map-editor/MapEditorPage.js
@@ -105,9 +105,12 @@ export default class MapEditorPage extends React.Component {
   }
 
   download(maplink, tempName) {
+    let canvasStore = this.canvasStore;
+    let size = canvasStore.getCanvasSize();
     $.ajax({
       url: maplink,
       type: 'GET',
+      data : size,
       xhrFields: {
         responseType: 'blob'
       },

diff --git a/src-ui/map-editor/canvas-store.js b/src-ui/map-editor/canvas-store.js
@@ -156,6 +156,20 @@ export default class CanvasStore extends Store {
     return this.state;
   }
 
+  getCanvasSize(){
+    if(this.state && this.state.coords && this.state.coords.size){
+      return {
+        width: this.state.coords.size.width,
+        height: this.state.coords.size.height
+      };
+    } else {
+      return {
+        width: 100,
+        height: 100
+      };
+    }
+  }
+
   emitChange() {
     this.state.multiNodeSelection = this.state.currentlySelectedNodes.length + this.state.currentlySelectedComments.length > 1;
     super.emitChange();