Fix how values are accessed in when preparing cartograms due to chang…

…e in api
riatelab · Jun 8, 2017 · bc70613 · bc70613
1 parent 07e661e
commit bc70613
Show file tree

Hide file tree

Showing 6 changed files with 81 additions and 82 deletions.
diff --git a/magrit_app/__init__.py b/magrit_app/__init__.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '0.3.0'
+__version__ = '0.3.1'
diff --git a/magrit_app/helpers/cartogram_doug.c b/magrit_app/helpers/cartogram_doug.c
diff --git a/magrit_app/helpers/cartogram_doug.h b/magrit_app/helpers/cartogram_doug.h
@@ -1,4 +1,4 @@
-/* Generated by Cython 0.25.1 */
+/* Generated by Cython 0.25.2 */
 
 #ifndef __PYX_HAVE__magrit_app__helpers__cartogram_doug
 #define __PYX_HAVE__magrit_app__helpers__cartogram_doug

diff --git a/magrit_app/helpers/cartogram_doug.pyx b/magrit_app/helpers/cartogram_doug.pyx
@@ -83,7 +83,7 @@ cdef class Cartogram(object):
         self.iterations = iterations
         self.total_features = <unsigned int>len(self.geodf)
         self.dForceReductionFactor = 0
-        self.values = geodf[[field_idx]].astype(float).values.T[0]
+        self.values = geodf.T.iloc[field_idx].astype(float).values
         self.aLocal = <Holder *>malloc(self.total_features * sizeof(Holder))
         if not self.aLocal:
             raise MemoryError()

diff --git 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.0-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.1-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
@@ -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.0-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.1-py3.6-linux-x86_64.egg/magrit_app/helpers/*.so /home/app/magrit/magrit_app/helpers/
 
 EXPOSE 9999