Merge pull request #141 in MAG/magics from release/4.2.3 to develop

* commit '2c156ba29ed40f88997aa07a84460070bb1a6c16':
  ADMIN1 BOUNDARIES - only plot regions in Italy MAGP-1214
  Qt driver: add flag to control if a pen is used for text rendering MAGP-1219
  Updating version to 4.2.3
  Updating travis plan
  Update .travis.yml
  Fixing Bug with Wind plotting [SD-27635]
  Fix Issues with the CDF graph
  Fix Severe clipping issues [SD-27045] [MAGP-1216] [CDS]
  dding test
  Adding the possibility to add legend parameters in the style definition
  Fix for Windows build
  Fix for Windows build
  Lambert failing to check later

.travis.yml

@@ -8,6 +8,7 @@ branches:
   only:
     - develop
     - master
+    - testing
 
 language: cpp
 
@@ -25,6 +26,10 @@ matrix:
 
     - os: osx
       osx_image: xcode10.1
+      addons: 
+        homebrew:
+          packages:
+            - pango
 
       env:
         MINICONDA_FILE="Miniconda3-latest-MacOSX-x86_64.sh"
@@ -34,6 +39,7 @@ env:
     - MAGICS_SRC=${TRAVIS_BUILD_DIR}
     - MAGICS_PYTHON_TESTS=${MAGICS_SRC}/test/python
     - MAGICS_PYTHON_SRC=${MAGICS_SRC}/../magics-python
+    - MAGICS_TEST_SRC=${MAGICS_SRC}/../magics-python
     - ECBUILD_SRC=${MAGICS_SRC}/../ecbuild
     - BUILD_DIR=${MAGICS_SRC}/build
     - INSTALL_DIR=/tmp/install
@@ -65,9 +71,10 @@ install:
   - git clone --depth 1 https://github.com/ecmwf/ecbuild.git ${ECBUILD_SRC}
   # install magics-python source
   - git clone -b develop --depth 1 https://github.com/ecmwf/magics-python.git ${MAGICS_PYTHON_SRC}
+
   # install conda deps
   - conda install boost libnetcdf expat jinja2 xarray scipy cftime
-  - conda install -c conda-forge proj4=5 eccodes pytest cairo pango
+  - conda install -c conda-forge proj4=5 eccodes pytest cairo pango pip
   # search for conda-installed libraries
   - |
     if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then

VERSION.cmake

@@ -7,8 +7,8 @@
 # does it submit to any jurisdiction.
 
 
-set ( metabuilder_version 4.2.3.1 )
-set ( _version 4.2.3.1 )
+set ( metabuilder_version 4.2.3 )
+set ( _version 4.2.3 )
 
 
 if ( MAGICS_BUILD )

share/magics/10m/ne_10m_admin_1_states_provinces_lines.VERSION.txt

@@ -0,0 +1 @@
+4.1.0

src/common/GeoRectangularProjection.cc

@@ -499,7 +499,7 @@ void GeoRectangularProjection::coastSetting(map<string, string>& setting, double
     setting["boundaries"] = resol + "/ne_" + resol + "_admin_0_boundary_lines_land";
 
     //! \note Administraive borders hardcoded to 10m resolution (low res version do not contain all info)
-    setting["administrative_boundaries"] = "10m/ne_10m_admin_1_states_provinces";
+    setting["administrative_boundaries"] = "10m/ne_10m_admin_1_states_provinces_lines";
 
     MagLog::dev() << "GeoRectangularProjection::coastSetting[" << abswidth << ", " << absheight << "]->" << ratio
                   << " resol: " << resol << endl;

src/common/PolarStereographicProjection.cc

@@ -821,7 +821,7 @@ void PolarStereographicProjection::coastSetting(map<string, string>& setting, do
     setting["boundaries"] = resol + "/ne_" + resol + "_admin_0_boundary_lines_land";
 
     //! \note Administraive borders hardcoded to 10m resolution (low res version do not contain all info)
-    setting["administrative_boundaries"] = "10m/ne_10m_admin_1_states_provinces";
+    setting["administrative_boundaries"] = "10m/ne_10m_admin_1_states_provinces_lines";
 
     MagLog::dev() << "GeoRectangularProjection::coastSetting[" << abswidth << ", " << absheight << "]->" << ratio
                   << " resol: " << resol << endl;

src/common/Proj4Projection.cc

@@ -1180,10 +1180,10 @@ void Proj4Projection::coastSetting(map<string, string>& setting, double abswidth
     setting["coast"]                     = resol + "/ne_" + resol + "_coastline";
     setting["rivers"]                    = resol + "/ne_" + resol + "_rivers_lake_centerlines";
     setting["boundaries"]                = resol + "/ne_" + resol + "_admin_0_boundary_lines_land";
-    setting["administrative_boundaries"] = resol + "/ne_" + resol + "_admin_1_states_provinces";
+//    setting["administrative_boundaries"] = resol + "/ne_" + resol + "_admin_1_states_provinces";
 
     //! \note Administraive borders hardcoded to 10m resolution (low res version do not contain all info)
-    setting["administrative_boundaries"] = "10m/ne_10m_admin_1_states_provinces";
+    setting["administrative_boundaries"] = "10m/ne_10m_admin_1_states_provinces_lines";
 }
 
 void Proj4Projection::visit(MetaDataVisitor& visitor, double left, double top, double width, double height,

src/decoders/ShapeDecoder.cc

@@ -130,6 +130,7 @@ void ShapeDecoder::customisedPoints(const std::set<string>&, CustomisedPointsLis
 }
 
 /*
+   Read boundaries ...
 
    \sa Boundaries::operator()
    */
@@ -187,8 +188,18 @@ void ShapeDecoder::decode(const Transformation& transformation, const string& fi
                 for (vector<string>::const_iterator val = values.begin(); val != values.end(); ++val) {
                     string ss = s.substr(0, val->length());
                     if (magCompare(*val, ss)) {
-                        add = true;
-                        MagLog::debug() << "Found " << ss << endl;
+                        if (magCompare(ss,"ITA")) {
+                            MagLog::debug() << "Enter special case for regions in Italy MAGP-1214" << endl;
+                            map<string, int>::iterator index_class = attributes.find("featurecla");
+                            string type = DBFReadStringAttribute(hDBF, i, index_class->second);
+                            map<string, int>::iterator index = filter.empty() ? attributes.end() : attributes.find(filter);
+                            if(magCompare(type,"Admin-1 boundary")){
+                                add = false;
+                            }
+                            else add = true;
+                        }
+                        else add = true;
+                        // MagLog::debug() << "Found " << ss << endl;
                         break;
                     }
                 }

src/visualisers/CoastPlotting.cc

@@ -201,7 +201,7 @@ void CoastPlotting::operator()(DrawingVisitor& parent) {
     coast_.clear();
     ocean_.clear();
 
-    coastSet_["administrative_boundaries"] = "10m/ne_10m_admin_1_states_provinces";
+    coastSet_["administrative_boundaries"] = "10m/ne_10m_admin_1_states_provinces_lines";
 
     if (magCompare(NoCoastPlottingAttributes::resolution_, "high") ||
         magCompare(NoCoastPlottingAttributes::resolution_, "full")) {

test/python/projection5.py

@@ -50,7 +50,7 @@
 		text_lines =  [projection["text"]])
 
 # Plot the result
-plot(output, map, coast, text)
+plot(output, coast, text)
 
 # For documentation purposes
 tofortran(projection["name"], output, map, coast, text)