Fix syntax error and prepare for 0.8.4

riatelab · Jun 8, 2018 · 8fd638d · 8fd638d
1 parent 1420c80
commit 8fd638d
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 11 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,6 +1,12 @@
 Changes
 =======
 
+0.8.4 (2018-06-08)
+------------------
+
+- Fix silly syntax error.
+
+
 0.8.3 (2018-06-08)
 ------------------
 

diff --git a/client/dist/app.96d1b4.js → client/dist/app.bbd020.js b/client/dist/app.96d1b4.js → client/dist/app.bbd020.js
diff --git a/client/dist/html/modules.html b/client/dist/html/modules.html
@@ -70,8 +70,8 @@
       </div>
   <script  src="static/vendor/bootstrap-native3.mod.min.js"></script>
   <script  src="static/vendor/opentip-native.min.js"></script>
-	<script  src="static/dist/vendor.96d1b4.js"></script>
+	<script  src="static/dist/vendor.bbd020.js"></script>
 	<script  src="static/dist/d3-custom.min.js"></script>
-	<script  src="static/dist/app.96d1b4.js"></script>
+	<script  src="static/dist/app.bbd020.js"></script>
 </body>
 </html>
diff --git a/client/dist/vendor.96d1b4.js → client/dist/vendor.bbd020.js b/client/dist/vendor.96d1b4.js → client/dist/vendor.bbd020.js
diff --git a/client/package.json b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "magrit-client",
-  "version": "0.8.3",
+  "version": "0.8.4",
   "homepage": "https://github.com/riatelab/magrit",
   "devDependencies": {
     "babel-core": "^6.26.0",

diff --git a/magrit_app/__init__.py b/magrit_app/__init__.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '0.8.3'
+__version__ = '0.8.4'
diff --git a/magrit_app/app.py b/magrit_app/app.py
@@ -724,9 +724,9 @@ async def carto_gridded_point(posted_data, user_id, app):
     with TemporaryDirectory() as tmp_dir:
         # Prepare the temporary filenames for the input layer(s) and for the result:
         filenames = {
-            'src_layer': path_join(tmp_dir, '{}.geojson'.format(get_name()),
-            'polygon_layer': path_join(tmp_dir, '{}.geojson'.format(get_name()) if posted_data['polygon_layer'] else None,
-            'mask_layer': path_join(tmp_dir, '{}.geojson'.format(get_name()) if posted_data['mask_layer'] else None,
+            'src_layer': path_join(tmp_dir, '{}.geojson'.format(get_name())),
+            'polygon_layer': path_join(tmp_dir, '{}.geojson'.format(get_name())) if posted_data['polygon_layer'] else None,
+            'mask_layer': path_join(tmp_dir, '{}.geojson'.format(get_name())) if posted_data['mask_layer'] else None,
             'result': None
         }
 

diff --git a/magrit_app/static/dist/app.96d1b4.js → magrit_app/static/dist/app.bbd020.js b/magrit_app/static/dist/app.96d1b4.js → magrit_app/static/dist/app.bbd020.js
diff --git a/magrit_app/static/dist/vendor.96d1b4.js → magrit_app/static/dist/vendor.bbd020.js b/magrit_app/static/dist/vendor.96d1b4.js → magrit_app/static/dist/vendor.bbd020.js
diff --git a/magrit_app/static/modules.html b/magrit_app/static/modules.html
@@ -70,8 +70,8 @@
       </div>
   <script  src="static/vendor/bootstrap-native3.mod.min.js"></script>
   <script  src="static/vendor/opentip-native.min.js"></script>
-	<script  src="static/dist/vendor.96d1b4.js"></script>
+	<script  src="static/dist/vendor.bbd020.js"></script>
 	<script  src="static/dist/d3-custom.min.js"></script>
-	<script  src="static/dist/app.96d1b4.js"></script>
+	<script  src="static/dist/app.bbd020.js"></script>
 </body>
 </html>
diff --git a/src/smoomacypy b/src/smoomacypy