From b43089e9d94f7b8c59169f6854180958170818c4 Mon Sep 17 00:00:00 2001 From: mthh Date: Fri, 9 Jun 2017 15:52:24 +0200 Subject: [PATCH] Fix scale bar reloading with unfixed size + add changelog + bump version number --- CHANGES.rst | 38 +++++++++++++++++++ magrit_app/__init__.py | 2 +- ...433.min.css => style.7047e0a53d2c.min.css} | 0 ...pp.874ba4894433.js => app.7047e0a53d2c.js} | 4 +- magrit_app/static/js/map_project.js | 2 +- ...433.json => translation.7047e0a53d2c.json} | 0 ...433.json => translation.7047e0a53d2c.json} | 0 ...433.json => translation.7047e0a53d2c.json} | 0 magrit_app/templates/modules.html | 4 +- misc/Docker/app/Dockerfile | 2 +- misc/dockerfiles/Dockerfile | 2 +- 11 files changed, 46 insertions(+), 8 deletions(-) create mode 100644 CHANGES.rst rename magrit_app/static/css/{style.874ba4894433.min.css => style.7047e0a53d2c.min.css} (100%) rename magrit_app/static/js/{app.874ba4894433.js => app.7047e0a53d2c.js} (99%) rename magrit_app/static/locales/en/{translation.874ba4894433.json => translation.7047e0a53d2c.json} (100%) rename magrit_app/static/locales/es/{translation.874ba4894433.json => translation.7047e0a53d2c.json} (100%) rename magrit_app/static/locales/fr/{translation.874ba4894433.json => translation.7047e0a53d2c.json} (100%) diff --git a/CHANGES.rst b/CHANGES.rst new file mode 100644 index 000000000..9ffb47fa9 --- /dev/null +++ b/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. + + + diff --git a/magrit_app/__init__.py b/magrit_app/__init__.py index 054fa8369..d71dfb697 100755 --- a/magrit_app/__init__.py +++ b/magrit_app/__init__.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- -__version__ = '0.3.1' +__version__ = '0.3.2' diff --git a/magrit_app/static/css/style.874ba4894433.min.css b/magrit_app/static/css/style.7047e0a53d2c.min.css similarity index 100% rename from magrit_app/static/css/style.874ba4894433.min.css rename to magrit_app/static/css/style.7047e0a53d2c.min.css diff --git a/magrit_app/static/js/app.874ba4894433.js b/magrit_app/static/js/app.7047e0a53d2c.js similarity index 99% rename from magrit_app/static/js/app.874ba4894433.js rename to magrit_app/static/js/app.7047e0a53d2c.js index 88aac25bc..c3f099fbc 100644 --- a/magrit_app/static/js/app.874ba4894433.js +++ b/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(); diff --git a/magrit_app/static/js/map_project.js b/magrit_app/static/js/map_project.js index c4df89759..cd0cc1dfb 100755 --- a/magrit_app/static/js/map_project.js +++ b/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(); diff --git a/magrit_app/static/locales/en/translation.874ba4894433.json b/magrit_app/static/locales/en/translation.7047e0a53d2c.json similarity index 100% rename from magrit_app/static/locales/en/translation.874ba4894433.json rename to magrit_app/static/locales/en/translation.7047e0a53d2c.json diff --git a/magrit_app/static/locales/es/translation.874ba4894433.json b/magrit_app/static/locales/es/translation.7047e0a53d2c.json similarity index 100% rename from magrit_app/static/locales/es/translation.874ba4894433.json rename to magrit_app/static/locales/es/translation.7047e0a53d2c.json diff --git a/magrit_app/static/locales/fr/translation.874ba4894433.json b/magrit_app/static/locales/fr/translation.7047e0a53d2c.json similarity index 100% rename from magrit_app/static/locales/fr/translation.874ba4894433.json rename to magrit_app/static/locales/fr/translation.7047e0a53d2c.json diff --git a/magrit_app/templates/modules.html b/magrit_app/templates/modules.html index 993e60bb5..ed1fb6447 100755 --- a/magrit_app/templates/modules.html +++ b/magrit_app/templates/modules.html @@ -7,7 +7,7 @@ {{ app_name }} - + @@ -51,6 +51,6 @@ - + diff --git a/misc/Docker/app/Dockerfile b/misc/Docker/app/Dockerfile index b4b394ec2..a8c07e47e 100755 --- a/misc/Docker/app/Dockerfile +++ b/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 diff --git a/misc/dockerfiles/Dockerfile b/misc/dockerfiles/Dockerfile index ac8858f89..fcd6843e9 100644 --- a/misc/dockerfiles/Dockerfile +++ b/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