Pull request #193: Release/4.10.0

Merge in MAG/magics from release/4.10.0 to master * commit '1492fb068324780066b8fa11029ff2594894b31f': (29 commits) Update projections for opendata notebook add expand mode for opendata notebook add automatic for MeteoNet orography Cartesian view: Adjust positionning of labels and titles [MAGP-1329] Cartesian view: year and month overlap on vertical axis [MAGP-1329] Remove lambert_north_atlantic projection wrongly implemented Qt driver: allow to customise scene highlighter MAGP-1330 Merge with ecmwflib Missing python call Update Magics Version to 4.10.0 Cartesian view: year and month overlap on vertical axis [MAGP-1329] Implements IntrepretAsPoints for NetcdfGeoMatrix [MAGP-1314] Added an MS Teams notification in case the workflow has failed or has been fixed. WrpeJSon : Cams format : fixing time issue Honour scanning mode when plotting space_view GRIB data [MAGP-1327] Contouring: add value scaling for satellite image GRIB data [MAGP-1326] Added opencharts projections to the correct projections file Bufr: adjust MvObs code to changes in Metview related to compressed subset handling MAGP-1325 Added opencharts projections Adding opencharts projections Cams : extending WrepJSON to undersdand CAMS point-based data. SkinnyWMS : improving wind default style SkinnyWMS: wind plotting ...
ecmwf · Dec 3, 2021 · 195e2a1 · 195e2a1
2 parents 5e55754 + 1492fb0
commit 195e2a1
Show file tree

Hide file tree

Showing 70 changed files with 2,384 additions and 1,538 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -115,3 +115,17 @@ jobs:
         repository: ecmwf/magics-test
         event-type: magics-updated
         client-payload: '{"magics_ref": "${{ github.ref }}", "magics_sha": "${{ github.sha }}"}'
+
+  notify:
+    name: notify
+    runs-on: ubuntu-20.04
+    needs:
+    - ci
+    - dispatch
+    if: always() && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop')
+    steps:
+    - name: Notify Teams
+      uses: ecmwf-actions/notify-teams@v1
+      with:
+        incoming_webhook: ${{ secrets.MS_TEAMS_INCOMING_WEBHOOK }}
+        needs_context: ${{ toJSON(needs) }}
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,7 +15,7 @@ cmake_minimum_required( VERSION 3.12 FATAL_ERROR )
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../ecbuild/cmake")
 find_package( ecbuild 3.4 REQUIRED )
 
-project( magics VERSION 4.9.4 LANGUAGES CXX )
+project( magics VERSION 4.10.0 LANGUAGES CXX )
 
 # make sure that the header files are installed into include/magics
 # note that this needs to be done before ecbuild_declare_project()
@@ -229,8 +229,28 @@ if ( HAVE_ODB )
   list( APPEND MAGICS_EXTRA_LIBRARIES odccore)
 endif()
 
+
+
 if( HAVE_CAIRO )
   list( APPEND MAGICS_PRIVATE_INCLUDE_DIRS ${PANGOCAIRO_INCLUDE_DIRS})
+
+  if( EC_OS_NAME MATCHES "windows" )
+
+
+    # Looks like the transitivity of includes is broken
+    find_package(PkgConfig REQUIRED)
+
+    pkg_search_module(GLIB REQUIRED glib-2.0)
+    list( APPEND MAGICS_PRIVATE_INCLUDE_DIRS ${GLIB_INCLUDE_DIRS})
+
+    pkg_search_module(CAIRO REQUIRED cairo)
+    list( APPEND MAGICS_PRIVATE_INCLUDE_DIRS ${CAIRO_INCLUDE_DIRS})
+
+    pkg_search_module(HARFBUZZ REQUIRED harfbuzz)
+    list( APPEND MAGICS_PRIVATE_INCLUDE_DIRS ${HARFBUZZ_INCLUDE_DIRS})
+
+  endif()
+
 endif()
 
 set( MAGICS_LIBRARIES MagPlus )

diff --git a/README.md b/README.md
@@ -2,8 +2,8 @@
 Magics README
 =============
 
-[![Linux & macOS: master](https://img.shields.io/travis/ecmwf/magics/master.svg?label=Linux-and-macOS-master)](https://travis-ci.org/ecmwf/magics/branches)
-[![Linux & macOS: develop](https://img.shields.io/travis/ecmwf/magics/develop.svg?label=Linux-and-macOS-dev)](https://travis-ci.org/ecmwf/magics/branches)
+[![Linux & macOS: master](https://img.shields.io/github/workflow/status/ecmwf/magics/ci/master?label=Linux-and-macOS-master)](https://github.com/ecmwf/magics/actions/workflows/ci.yml?query=branch%3Amaster)
+[![Linux & macOS: develop](https://img.shields.io/github/workflow/status/ecmwf/magics/ci/develop?label=Linux-and-macOS-develop)](https://github.com/ecmwf/magics/actions/workflows/ci.yml?query=branch%3Adevelop)
 [![Windows: master](https://img.shields.io/appveyor/ci/ecmwf/magics/master.svg?label=Windows-master)](https://ci.appveyor.com/project/ecmwf/magics/branch/master)
 [![Windows: develop](https://img.shields.io/appveyor/ci/ecmwf/magics/develop.svg?label=Windows-dev)](https://ci.appveyor.com/project/ecmwf/magics/branch/develop)
 
@@ -25,8 +25,7 @@ Gallery of Notebooks
 Docker Image
 ------------
 
-[![test](https://github.com/ecmwf/magics/actions/workflows/docker-latest.yml/badge.svg)](https://github.com/ecmwf/magics/actions)
-
+[![DockerHub](https://github.com/ecmwf/magics/actions/workflows/docker-latest.yml/badge.svg)](https://github.com/ecmwf/magics/actions/workflows/docker-latest.yml)
 [![Docker Pulls](https://img.shields.io/docker/pulls/ecmwf/magics)](https://hub.docker.com/r/ecmwf/magics)
 
 

diff --git a/share/magics/epsg.json b/share/magics/epsg.json
@@ -51,16 +51,6 @@
                 "default_max_longitude" : 180
             }
         },
-        {
-            "lambert_north_atlantic": {
-                "definition": "+proj=lcc +lon_0=40w +x_0=2000000 +y_0=2000000 +ellps=WGS84 +datum=WGS84",
-                "max_latitude": 90,
-                "max_longitude": 180,
-                "method": "conic",
-                "min_latitude": -20,
-                "min_longitude": -180
-            }
-        },
         {
             "EPSG:32661": {
                 "definition": "+proj=stere +lat_0=90 +lat_ts=90 +lon_0=0 +k=0.994 +x_0=2000000 +y_0=2000000 +ellps=WGS84 +datum=WGS84 +units=m +no_defs",

diff --git a/share/magics/projections.json b/share/magics/projections.json
diff --git a/share/magics/styles/ecmwf/imgd.json b/share/magics/styles/ecmwf/imgd.json
@@ -0,0 +1,12 @@
+[
+  {
+    "prefered_units": "K",
+    "match": [
+      {
+        "paramId": "3127",
+        "shortName": "imgd",
+        "functionCode": "1"
+      }
+    ]
+  }
+]
diff --git a/share/magics/styles/ecmwf/orog.json b/share/magics/styles/ecmwf/orog.json
@@ -0,0 +1,15 @@
+[
+  {
+    "description" : "Meteonet orography",
+    "prefered_units": "m",
+    "styles": [
+      "sh_orog_metres"
+    ],
+    "match": [
+      {
+        "paramId": "3008",
+        "shortName": "h"
+      }
+    ]
+  }
+]
diff --git a/share/magics/styles/ecmwf/styles.json b/share/magics/styles/ecmwf/styles.json
@@ -9424,24 +9424,30 @@
     },
     "coloured_flags" : {
         "legend" : "on",
-        "wind_field_type" : "arrows",
-        "wind_arrow_unit_velocity" : 10.0,
-        "wind_arrow_min_speed" : 0.0,  
-        "wind_arrow_calm_below" : 0.1,              
+        "wind_field_type" : "flags",
         "wind_advanced_method" : "on",
-        "wind_advanced_colour_selection_type" : "count",
+        "wind_advanced_colour_max_value" : 25.00,
+        "wind_advanced_colour_min_value" : 0.00,
         "wind_advanced_colour_table_colour_method" : "calculate",
-        "wind_advanced_colour_direction" : "anti_clockwise",
-        "wind_advanced_colour_min_level_colour" : "turquoise",
-        "wind_thinning_factor" :  5,
-        "wind_thinning_method" :  "automatic",
-        "wind_advanced_colour_max_level_colour" : "purple_red"
+        "wind_advanced_colour_max_level_colour":  "red",
+        "wind_advanced_colour_min_level_colour": "blue",
+        "wind_flag_origin_marker" : "dot",
+        "wind_thinning_factor" : 5,
+        "wind_thinning_method": "automatic"
     },
     "flags" : {
-        "wind_field_type" : "flags"
+        "wind_field_type" : "flags",
+        "wind_flag_colour" : "black",
+        "wind_flag_calm_indicator_size" : 0.1,
+        "wind_thinning_factor" : 4,
+        "wind_thinning_method": "automatic",
+        "wind_flag_origin_marker" : "dot",
+        "wind_flag_length": 0.5
     },
     "gold_arrows": {
         "wind_field_type" : "arrows",
-        "wind_arrow_colour" : "gold"
+        "wind_arrow_colour" : "gold",
+        "wind_thinning_factor" : 4,
+        "wind_thinning_method": "automatic"
     }
 }
diff --git a/share/magics/styles/ecmwf/wind.json b/share/magics/styles/ecmwf/wind.json
@@ -1,10 +1,8 @@
 [
   {
-    "eccharts_layer": "2t",
-    "prefered_units": "C",
     "styles": [
-      "coloured_flags",
       "flags",
+      "coloured_flags",
       "gold_arrows"
     ],
     "match": [