# Conflicts:
#   java/src/main/java/uk/ac/ceh/gateway/catalogue/gemini/Geometry.java
#   web/src/editor/src/editors/MonitoringFacilityEditorView.js
#   web/src/editor/src/geometryMap/Geometry.js
#   web/src/editor/src/geometryMap/GeometryView.js