ADMIN1 BOUNDARIES - only plot regions in Italy MAGP-1214

Change admin1 shapefiles (lines instead of polygons) and removed shape files not needed anymore
ecmwf · Nov 26, 2019 · 2c156ba · 2c156ba
1 parent d0ec9f3
commit 2c156ba
Show file tree

Hide file tree

Showing 25 changed files with 19 additions and 12 deletions.
diff --git a/share/magics/10m/ne_10m_admin_1_states_provinces.VERSION.txt b/share/magics/10m/ne_10m_admin_1_states_provinces.VERSION.txt
diff --git a/share/magics/10m/ne_10m_admin_1_states_provinces.shp b/share/magics/10m/ne_10m_admin_1_states_provinces.shp
diff --git a/share/magics/10m/ne_10m_admin_1_states_provinces.shx b/share/magics/10m/ne_10m_admin_1_states_provinces.shx
diff --git a/share/magics/10m/ne_10m_admin_1_states_provinces_lines.VERSION.txt b/share/magics/10m/ne_10m_admin_1_states_provinces_lines.VERSION.txt
@@ -0,0 +1 @@
+4.1.0
diff --git a/...s/10m/ne_10m_admin_1_states_provinces.dbf → ...ne_10m_admin_1_states_provinces_lines.dbf b/...s/10m/ne_10m_admin_1_states_provinces.dbf → ...ne_10m_admin_1_states_provinces_lines.dbf
diff --git a/...s/10m/ne_10m_admin_1_states_provinces.prj → ...ne_10m_admin_1_states_provinces_lines.prj b/...s/10m/ne_10m_admin_1_states_provinces.prj → ...ne_10m_admin_1_states_provinces_lines.prj
diff --git a/share/magics/10m/ne_10m_admin_1_states_provinces_lines.shp b/share/magics/10m/ne_10m_admin_1_states_provinces_lines.shp
diff --git a/share/magics/10m/ne_10m_admin_1_states_provinces_lines.shx b/share/magics/10m/ne_10m_admin_1_states_provinces_lines.shx
diff --git a/share/magics/110m/ne_110m_admin_1_states_provinces.VERSION.txt b/share/magics/110m/ne_110m_admin_1_states_provinces.VERSION.txt
diff --git a/share/magics/110m/ne_110m_admin_1_states_provinces.dbf b/share/magics/110m/ne_110m_admin_1_states_provinces.dbf
diff --git a/share/magics/110m/ne_110m_admin_1_states_provinces.prj b/share/magics/110m/ne_110m_admin_1_states_provinces.prj
diff --git a/share/magics/110m/ne_110m_admin_1_states_provinces.sbn b/share/magics/110m/ne_110m_admin_1_states_provinces.sbn
diff --git a/share/magics/110m/ne_110m_admin_1_states_provinces.sbx b/share/magics/110m/ne_110m_admin_1_states_provinces.sbx
diff --git a/share/magics/110m/ne_110m_admin_1_states_provinces.shp b/share/magics/110m/ne_110m_admin_1_states_provinces.shp
diff --git a/share/magics/110m/ne_110m_admin_1_states_provinces.shx b/share/magics/110m/ne_110m_admin_1_states_provinces.shx
diff --git a/share/magics/50m/ne_50m_admin_1_states_provinces_lines_shp.VERSION.txt b/share/magics/50m/ne_50m_admin_1_states_provinces_lines_shp.VERSION.txt
diff --git a/share/magics/50m/ne_50m_admin_1_states_provinces_lines_shp.dbf b/share/magics/50m/ne_50m_admin_1_states_provinces_lines_shp.dbf
diff --git a/share/magics/50m/ne_50m_admin_1_states_provinces_lines_shp.prj b/share/magics/50m/ne_50m_admin_1_states_provinces_lines_shp.prj
diff --git a/share/magics/50m/ne_50m_admin_1_states_provinces_lines_shp.shp b/share/magics/50m/ne_50m_admin_1_states_provinces_lines_shp.shp
diff --git a/share/magics/50m/ne_50m_admin_1_states_provinces_lines_shp.shx b/share/magics/50m/ne_50m_admin_1_states_provinces_lines_shp.shx
diff --git a/src/common/GeoRectangularProjection.cc b/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;

diff --git a/src/common/PolarStereographicProjection.cc b/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;

diff --git a/src/common/Proj4Projection.cc b/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,

diff --git a/src/decoders/ShapeDecoder.cc b/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;
                     }
                 }

diff --git a/src/visualisers/CoastPlotting.cc b/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")) {