Fix scale bar reloading with unfixed size + add changelog + bump vers…

…ion number

CHANGES.rst

@@ -0,0 +1,38 @@
+Changes
+=======
+
+0.3.2 (2017-06-09)
+------------------
+
+- Fix text annotation behavior when clicking on "cancel".
+
+- Fix legend displaying "false" after reloading (when size was not fixed).
+
+- Switch color between "OK" and "Cancel" buttons on modal box.
+
+
+0.3.1 (2017-06-08)
+------------------
+
+- Fix how values are retrieved for cartogram.
+
+
+0.3.0 (2017-06-07)
+------------------
+
+- CSV reading: fix the recognition of some encodings + fix the reading of files whose first column contains an empty name.
+
+- Modifies text annotations (internally): now allows the selection of the alignment (left, center, right) of the text within the block.
+
+- Modifies versioning to follow SemVer more strictly.
+
+- Fix Lambert 93 projection, accessible from the menu of projections (the display was non-existent at certain levels of zoom with this projection).
+
+- Removes two projections that could be considered redundant.
+
+- Fix bug with choice of pictogram size.
+
+- Fix bug in the order in which some features are reloaded from project file.
+
+
+

magrit_app/__init__.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '0.3.1'
+__version__ = '0.3.2'

magrit_app/static/js/app.874ba4894433.js → magrit_app/static/js/app.7047e0a53d2c.js

@@ -1101,7 +1101,7 @@ function parseQuery(search) {
     lng: lang,
     fallbackLng: existing_lang[0],
     backend: {
-      loadPath: 'static/locales/{{lng}}/translation.874ba4894433.json'
+      loadPath: 'static/locales/{{lng}}/translation.7047e0a53d2c.json'
     }
   }, function (err, tr) {
     if (err) {
@@ -15686,7 +15686,7 @@ function apply_user_preferences(json_pref) {
         scaleBar.x = map_config.layout_features.scale_bar.x;
         scaleBar.y = map_config.layout_features.scale_bar.y;
         scaleBar.Scale._groups[0][0].setAttribute('transform', map_config.layout_features.scale_bar.transform);
-        scaleBar.resize();
+        scaleBar.update(); //scaleBar.resize();
       }
       if (map_config.layout_features.north_arrow) {
         northArrow.display();

magrit_app/static/js/map_project.js

@@ -498,7 +498,7 @@ function apply_user_preferences(json_pref){
         scaleBar.x = map_config.layout_features.scale_bar.x;
         scaleBar.y = map_config.layout_features.scale_bar.y;
         scaleBar.Scale._groups[0][0].setAttribute('transform', map_config.layout_features.scale_bar.transform);
-        scaleBar.resize();
+        scaleBar.update(); //scaleBar.resize();
       }
       if (map_config.layout_features.north_arrow) {
         northArrow.display();

magrit_app/templates/modules.html

@@ -7,7 +7,7 @@
     <title> {{ app_name }} </title>
     <link rel="icon" type="image/png" href="static/img/favicon.png" />
     <link href="static/css/scoped-bootstrap.min.css" rel="stylesheet" type="text/css">
-	<link href="static/css/style.874ba4894433.min.css" rel="stylesheet"  type="text/css">
+	<link href="static/css/style.7047e0a53d2c.min.css" rel="stylesheet"  type="text/css">
     <link href="static/css/vanilla-dataTables.min.css" rel="stylesheet" type="text/css">
     <link href="static/css/alertify.min.css" rel="stylesheet" type="text/css">
     <link href="static/css/semantic.min.css" rel="stylesheet" type="text/css">
@@ -51,6 +51,6 @@
         </div>
       </noscript>
     <script  src="static/js/lib/bootstrap-native3.mod.min.js"></script>
-	<script  src="static/js/app.874ba4894433.js"></script>
+	<script  src="static/js/app.7047e0a53d2c.js"></script>
 </body>
 </html>

misc/Docker/app/Dockerfile

@@ -73,7 +73,7 @@ RUN wget https://bootstrap.pypa.io/get-pip.py && python3.6 get-pip.py
 RUN cd /home/app/magrit/ \
     && pip3.6 install -U -r requirements-dev.txt \
     && python3.6 setup.py install
-RUN cd /home/app && cp /usr/local/lib/python3.6/dist-packages/magrit_app-0.3.1-py3.6-linux-x86_64.egg/magrit_app/helpers/*.so /home/app/magrit/magrit_app/helpers/
+RUN cd /home/app && cp /usr/local/lib/python3.6/dist-packages/magrit_app-0.3.2-py3.6-linux-x86_64.egg/magrit_app/helpers/*.so /home/app/magrit/magrit_app/helpers/
 
 EXPOSE 9999
 

misc/dockerfiles/Dockerfile

@@ -49,7 +49,7 @@ RUN wget https://bootstrap.pypa.io/get-pip.py && python3.6 get-pip.py
 RUN cd /home/app/magrit/ \
     && pip3.6 install -U -r requirements-dev.txt \
     && python3.6 setup.py install
-RUN cd /home/app && cp /usr/local/lib/python3.6/dist-packages/magrit_app-0.3.1-py3.6-linux-x86_64.egg/magrit_app/helpers/*.so /home/app/magrit/magrit_app/helpers/
+RUN cd /home/app && cp /usr/local/lib/python3.6/dist-packages/magrit_app-0.3.2-py3.6-linux-x86_64.egg/magrit_app/helpers/*.so /home/app/magrit/magrit_app/helpers/
 
 EXPOSE 9999